diff options
author | Ben Collins <bcollins@ubuntu.com> | 2006-06-12 18:15:31 -0400 |
---|---|---|
committer | Ben Collins <bcollins@ubuntu.com> | 2006-06-12 18:15:31 -0400 |
commit | 6737231ead125c7cee7ce4d3a74179bdac085529 (patch) | |
tree | f0c996c8c48d07398c47ada5a2dacdcbf0800770 /drivers/ieee1394/sbp2.c | |
parent | e269d276792684a13ab0d9acd8c024ec7d6c5f4d (diff) |
ieee1394: add preprocessor constant for invalid csr address
Replace occurrences of the magic value ~(u64)0 for invalid
CSR address spaces by a named constant for better readability.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/ieee1394/sbp2.c')
-rw-r--r-- | drivers/ieee1394/sbp2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 975a56bfab3d..1d5ceb7ecc83 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
@@ -794,7 +794,7 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud | |||
794 | scsi_id->ud = ud; | 794 | scsi_id->ud = ud; |
795 | scsi_id->speed_code = IEEE1394_SPEED_100; | 795 | scsi_id->speed_code = IEEE1394_SPEED_100; |
796 | scsi_id->max_payload_size = sbp2_speedto_max_payload[IEEE1394_SPEED_100]; | 796 | scsi_id->max_payload_size = sbp2_speedto_max_payload[IEEE1394_SPEED_100]; |
797 | scsi_id->status_fifo_addr = ~0ULL; | 797 | scsi_id->status_fifo_addr = CSR1212_INVALID_ADDR_SPACE; |
798 | atomic_set(&scsi_id->sbp2_login_complete, 0); | 798 | atomic_set(&scsi_id->sbp2_login_complete, 0); |
799 | INIT_LIST_HEAD(&scsi_id->sbp2_command_orb_inuse); | 799 | INIT_LIST_HEAD(&scsi_id->sbp2_command_orb_inuse); |
800 | INIT_LIST_HEAD(&scsi_id->sbp2_command_orb_completed); | 800 | INIT_LIST_HEAD(&scsi_id->sbp2_command_orb_completed); |
@@ -848,7 +848,7 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud | |||
848 | &sbp2_highlevel, ud->ne->host, &sbp2_ops, | 848 | &sbp2_highlevel, ud->ne->host, &sbp2_ops, |
849 | sizeof(struct sbp2_status_block), sizeof(quadlet_t), | 849 | sizeof(struct sbp2_status_block), sizeof(quadlet_t), |
850 | ud->ne->host->low_addr_space, CSR1212_ALL_SPACE_END); | 850 | ud->ne->host->low_addr_space, CSR1212_ALL_SPACE_END); |
851 | if (scsi_id->status_fifo_addr == ~0ULL) { | 851 | if (scsi_id->status_fifo_addr == CSR1212_INVALID_ADDR_SPACE) { |
852 | SBP2_ERR("failed to allocate status FIFO address range"); | 852 | SBP2_ERR("failed to allocate status FIFO address range"); |
853 | goto failed_alloc; | 853 | goto failed_alloc; |
854 | } | 854 | } |
@@ -1090,9 +1090,9 @@ static void sbp2_remove_device(struct scsi_id_instance_data *scsi_id) | |||
1090 | SBP2_DMA_FREE("single query logins data"); | 1090 | SBP2_DMA_FREE("single query logins data"); |
1091 | } | 1091 | } |
1092 | 1092 | ||
1093 | if (scsi_id->status_fifo_addr != ~0ULL) | 1093 | if (scsi_id->status_fifo_addr != CSR1212_INVALID_ADDR_SPACE) |
1094 | hpsb_unregister_addrspace(&sbp2_highlevel, hi->host, | 1094 | hpsb_unregister_addrspace(&sbp2_highlevel, hi->host, |
1095 | scsi_id->status_fifo_addr); | 1095 | scsi_id->status_fifo_addr); |
1096 | 1096 | ||
1097 | scsi_id->ud->device.driver_data = NULL; | 1097 | scsi_id->ud->device.driver_data = NULL; |
1098 | 1098 | ||