diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2005-07-06 13:32:07 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-07-14 11:03:15 -0400 |
commit | fa2a1ce53d4b869b74da9a770770c79f9af64914 (patch) | |
tree | da350e79117d3177f51c2788c51aeba425afd4ca /drivers/scsi/qla2xxx/qla_def.h | |
parent | ba5140b48e35aa4e4b57eb6db5cface63d7bd712 (diff) |
[SCSI] qla2xxx: Code scrubbing.
Code scrubbing.
- Remove trailing whitespace from driver files.
- Remove unused #defines and inlines.
- Standardize on C comments (// -> /* */)
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_def.h')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 7c1618019c42..bd87d5f1ffbb 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -116,7 +116,7 @@ | |||
116 | 116 | ||
117 | #include "qla_settings.h" | 117 | #include "qla_settings.h" |
118 | 118 | ||
119 | /* | 119 | /* |
120 | * Data bit definitions | 120 | * Data bit definitions |
121 | */ | 121 | */ |
122 | #define BIT_0 0x1 | 122 | #define BIT_0 0x1 |
@@ -194,8 +194,8 @@ | |||
194 | #define MAX_TARGETS MAX_FIBRE_DEVICES | 194 | #define MAX_TARGETS MAX_FIBRE_DEVICES |
195 | #define MIN_LUNS 8 | 195 | #define MIN_LUNS 8 |
196 | #define MAX_LUNS MAX_FIBRE_LUNS | 196 | #define MAX_LUNS MAX_FIBRE_LUNS |
197 | #define MAX_CMDS_PER_LUN 255 | 197 | #define MAX_CMDS_PER_LUN 255 |
198 | 198 | ||
199 | /* | 199 | /* |
200 | * Fibre Channel device definitions. | 200 | * Fibre Channel device definitions. |
201 | */ | 201 | */ |
@@ -243,7 +243,7 @@ | |||
243 | #define RESPONSE_ENTRY_CNT_2300 512 /* Number of response entries.*/ | 243 | #define RESPONSE_ENTRY_CNT_2300 512 /* Number of response entries.*/ |
244 | 244 | ||
245 | /* | 245 | /* |
246 | * SCSI Request Block | 246 | * SCSI Request Block |
247 | */ | 247 | */ |
248 | typedef struct srb { | 248 | typedef struct srb { |
249 | struct list_head list; | 249 | struct list_head list; |
@@ -254,7 +254,7 @@ typedef struct srb { | |||
254 | struct scsi_cmnd *cmd; /* Linux SCSI command pkt */ | 254 | struct scsi_cmnd *cmd; /* Linux SCSI command pkt */ |
255 | 255 | ||
256 | struct timer_list timer; /* Command timer */ | 256 | struct timer_list timer; /* Command timer */ |
257 | atomic_t ref_count; /* Reference count for this structure */ | 257 | atomic_t ref_count; /* Reference count for this structure */ |
258 | uint16_t flags; | 258 | uint16_t flags; |
259 | 259 | ||
260 | /* Request state */ | 260 | /* Request state */ |
@@ -312,7 +312,7 @@ struct device_reg_2xxx { | |||
312 | uint16_t flash_data; /* Flash BIOS data */ | 312 | uint16_t flash_data; /* Flash BIOS data */ |
313 | uint16_t unused_1[1]; /* Gap */ | 313 | uint16_t unused_1[1]; /* Gap */ |
314 | uint16_t ctrl_status; /* Control/Status */ | 314 | uint16_t ctrl_status; /* Control/Status */ |
315 | #define CSR_FLASH_64K_BANK BIT_3 /* Flash upper 64K bank select */ | 315 | #define CSR_FLASH_64K_BANK BIT_3 /* Flash upper 64K bank select */ |
316 | #define CSR_FLASH_ENABLE BIT_1 /* Flash BIOS Read/Write enable */ | 316 | #define CSR_FLASH_ENABLE BIT_1 /* Flash BIOS Read/Write enable */ |
317 | #define CSR_ISP_SOFT_RESET BIT_0 /* ISP soft reset */ | 317 | #define CSR_ISP_SOFT_RESET BIT_0 /* ISP soft reset */ |
318 | 318 | ||
@@ -355,12 +355,12 @@ struct device_reg_2xxx { | |||
355 | uint16_t rsp_q_out; /* Out-Pointer */ | 355 | uint16_t rsp_q_out; /* Out-Pointer */ |
356 | 356 | ||
357 | /* RISC to Host Status */ | 357 | /* RISC to Host Status */ |
358 | uint32_t host_status; | 358 | uint32_t host_status; |
359 | #define HSR_RISC_INT BIT_15 /* RISC interrupt */ | 359 | #define HSR_RISC_INT BIT_15 /* RISC interrupt */ |
360 | #define HSR_RISC_PAUSED BIT_8 /* RISC Paused */ | 360 | #define HSR_RISC_PAUSED BIT_8 /* RISC Paused */ |
361 | 361 | ||
362 | /* Host to Host Semaphore */ | 362 | /* Host to Host Semaphore */ |
363 | uint16_t host_semaphore; | 363 | uint16_t host_semaphore; |
364 | uint16_t unused_3[17]; /* Gap */ | 364 | uint16_t unused_3[17]; /* Gap */ |
365 | uint16_t mailbox0; | 365 | uint16_t mailbox0; |
366 | uint16_t mailbox1; | 366 | uint16_t mailbox1; |
@@ -1057,7 +1057,7 @@ typedef struct { | |||
1057 | * LSB BIT 5 = Rx Sensitivity 1G bit 1 | 1057 | * LSB BIT 5 = Rx Sensitivity 1G bit 1 |
1058 | * LSB BIT 6 = Rx Sensitivity 1G bit 2 | 1058 | * LSB BIT 6 = Rx Sensitivity 1G bit 2 |
1059 | * LSB BIT 7 = Rx Sensitivity 1G bit 3 | 1059 | * LSB BIT 7 = Rx Sensitivity 1G bit 3 |
1060 | * | 1060 | * |
1061 | * MSB BIT 0 = Tx Sensitivity 2G bit 0 | 1061 | * MSB BIT 0 = Tx Sensitivity 2G bit 0 |
1062 | * MSB BIT 1 = Tx Sensitivity 2G bit 1 | 1062 | * MSB BIT 1 = Tx Sensitivity 2G bit 1 |
1063 | * MSB BIT 2 = Tx Sensitivity 2G bit 2 | 1063 | * MSB BIT 2 = Tx Sensitivity 2G bit 2 |
@@ -1075,7 +1075,7 @@ typedef struct { | |||
1075 | * LSB BIT 5 = Output Swing 2G bit 0 | 1075 | * LSB BIT 5 = Output Swing 2G bit 0 |
1076 | * LSB BIT 6 = Output Swing 2G bit 1 | 1076 | * LSB BIT 6 = Output Swing 2G bit 1 |
1077 | * LSB BIT 7 = Output Swing 2G bit 2 | 1077 | * LSB BIT 7 = Output Swing 2G bit 2 |
1078 | * | 1078 | * |
1079 | * MSB BIT 0 = Output Emphasis 2G bit 0 | 1079 | * MSB BIT 0 = Output Emphasis 2G bit 0 |
1080 | * MSB BIT 1 = Output Emphasis 2G bit 1 | 1080 | * MSB BIT 1 = Output Emphasis 2G bit 1 |
1081 | * MSB BIT 2 = Output Enable | 1081 | * MSB BIT 2 = Output Enable |
@@ -1997,7 +1997,7 @@ struct qla_board_info { | |||
1997 | struct gid_list_info { | 1997 | struct gid_list_info { |
1998 | uint8_t al_pa; | 1998 | uint8_t al_pa; |
1999 | uint8_t area; | 1999 | uint8_t area; |
2000 | uint8_t domain; | 2000 | uint8_t domain; |
2001 | uint8_t loop_id_2100; /* ISP2100/ISP2200 -- 4 bytes. */ | 2001 | uint8_t loop_id_2100; /* ISP2100/ISP2200 -- 4 bytes. */ |
2002 | uint16_t loop_id; /* ISP23XX -- 6 bytes. */ | 2002 | uint16_t loop_id; /* ISP23XX -- 6 bytes. */ |
2003 | uint16_t reserved_1; /* ISP24XX -- 8 bytes. */ | 2003 | uint16_t reserved_1; /* ISP24XX -- 8 bytes. */ |
@@ -2111,7 +2111,7 @@ typedef struct scsi_qla_host { | |||
2111 | #define ISP_ABORT_RETRY 20 /* ISP aborted. */ | 2111 | #define ISP_ABORT_RETRY 20 /* ISP aborted. */ |
2112 | #define FCPORT_RESCAN_NEEDED 21 /* IO descriptor processing needed */ | 2112 | #define FCPORT_RESCAN_NEEDED 21 /* IO descriptor processing needed */ |
2113 | #define IODESC_PROCESS_NEEDED 22 /* IO descriptor processing needed */ | 2113 | #define IODESC_PROCESS_NEEDED 22 /* IO descriptor processing needed */ |
2114 | #define IOCTL_ERROR_RECOVERY 23 | 2114 | #define IOCTL_ERROR_RECOVERY 23 |
2115 | #define LOOP_RESET_NEEDED 24 | 2115 | #define LOOP_RESET_NEEDED 24 |
2116 | #define BEACON_BLINK_NEEDED 25 | 2116 | #define BEACON_BLINK_NEEDED 25 |
2117 | 2117 | ||
@@ -2126,7 +2126,7 @@ typedef struct scsi_qla_host { | |||
2126 | #define SRB_MIN_REQ 128 | 2126 | #define SRB_MIN_REQ 128 |
2127 | mempool_t *srb_mempool; | 2127 | mempool_t *srb_mempool; |
2128 | 2128 | ||
2129 | /* This spinlock is used to protect "io transactions", you must | 2129 | /* This spinlock is used to protect "io transactions", you must |
2130 | * aquire it before doing any IO to the card, eg with RD_REG*() and | 2130 | * aquire it before doing any IO to the card, eg with RD_REG*() and |
2131 | * WRT_REG*() for the duration of your entire commandtransaction. | 2131 | * WRT_REG*() for the duration of your entire commandtransaction. |
2132 | * | 2132 | * |
@@ -2153,12 +2153,12 @@ typedef struct scsi_qla_host { | |||
2153 | response_t *response_ring_ptr; /* Current address. */ | 2153 | response_t *response_ring_ptr; /* Current address. */ |
2154 | uint16_t rsp_ring_index; /* Current index. */ | 2154 | uint16_t rsp_ring_index; /* Current index. */ |
2155 | uint16_t response_q_length; | 2155 | uint16_t response_q_length; |
2156 | 2156 | ||
2157 | struct isp_operations isp_ops; | 2157 | struct isp_operations isp_ops; |
2158 | 2158 | ||
2159 | /* Outstandings ISP commands. */ | 2159 | /* Outstandings ISP commands. */ |
2160 | srb_t *outstanding_cmds[MAX_OUTSTANDING_COMMANDS]; | 2160 | srb_t *outstanding_cmds[MAX_OUTSTANDING_COMMANDS]; |
2161 | uint32_t current_outstanding_cmd; | 2161 | uint32_t current_outstanding_cmd; |
2162 | srb_t *status_srb; /* Status continuation entry. */ | 2162 | srb_t *status_srb; /* Status continuation entry. */ |
2163 | 2163 | ||
2164 | uint16_t revision; | 2164 | uint16_t revision; |
@@ -2187,7 +2187,7 @@ typedef struct scsi_qla_host { | |||
2187 | #define LOOP_P2P 2 | 2187 | #define LOOP_P2P 2 |
2188 | #define P2P_LOOP 3 | 2188 | #define P2P_LOOP 3 |
2189 | 2189 | ||
2190 | uint8_t marker_needed; | 2190 | uint8_t marker_needed; |
2191 | 2191 | ||
2192 | uint8_t interrupts_on; | 2192 | uint8_t interrupts_on; |
2193 | 2193 | ||
@@ -2208,7 +2208,7 @@ typedef struct scsi_qla_host { | |||
2208 | uint8_t mbx_count; | 2208 | uint8_t mbx_count; |
2209 | uint16_t last_loop_id; | 2209 | uint16_t last_loop_id; |
2210 | 2210 | ||
2211 | uint32_t login_retry_count; | 2211 | uint32_t login_retry_count; |
2212 | 2212 | ||
2213 | /* Fibre Channel Device List. */ | 2213 | /* Fibre Channel Device List. */ |
2214 | struct list_head fcports; | 2214 | struct list_head fcports; |
@@ -2253,7 +2253,7 @@ typedef struct scsi_qla_host { | |||
2253 | dma_addr_t rlc_rsp_dma; | 2253 | dma_addr_t rlc_rsp_dma; |
2254 | rpt_lun_cmd_rsp_t *rlc_rsp; | 2254 | rpt_lun_cmd_rsp_t *rlc_rsp; |
2255 | 2255 | ||
2256 | /* Small DMA pool allocations -- maximum 256 bytes in length. */ | 2256 | /* Small DMA pool allocations -- maximum 256 bytes in length. */ |
2257 | #define DMA_POOL_SIZE 256 | 2257 | #define DMA_POOL_SIZE 256 |
2258 | struct dma_pool *s_dma_pool; | 2258 | struct dma_pool *s_dma_pool; |
2259 | 2259 | ||
@@ -2281,10 +2281,10 @@ typedef struct scsi_qla_host { | |||
2281 | uint32_t mbx_flags; | 2281 | uint32_t mbx_flags; |
2282 | #define MBX_IN_PROGRESS BIT_0 | 2282 | #define MBX_IN_PROGRESS BIT_0 |
2283 | #define MBX_BUSY BIT_1 /* Got the Access */ | 2283 | #define MBX_BUSY BIT_1 /* Got the Access */ |
2284 | #define MBX_SLEEPING_ON_SEM BIT_2 | 2284 | #define MBX_SLEEPING_ON_SEM BIT_2 |
2285 | #define MBX_POLLING_FOR_COMP BIT_3 | 2285 | #define MBX_POLLING_FOR_COMP BIT_3 |
2286 | #define MBX_COMPLETED BIT_4 | 2286 | #define MBX_COMPLETED BIT_4 |
2287 | #define MBX_TIMEDOUT BIT_5 | 2287 | #define MBX_TIMEDOUT BIT_5 |
2288 | #define MBX_ACCESS_TIMEDOUT BIT_6 | 2288 | #define MBX_ACCESS_TIMEDOUT BIT_6 |
2289 | 2289 | ||
2290 | mbx_cmd_t mc; | 2290 | mbx_cmd_t mc; |
@@ -2345,7 +2345,7 @@ typedef struct scsi_qla_host { | |||
2345 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \ | 2345 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \ |
2346 | test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \ | 2346 | test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \ |
2347 | atomic_read(&ha->loop_state) == LOOP_DOWN) | 2347 | atomic_read(&ha->loop_state) == LOOP_DOWN) |
2348 | 2348 | ||
2349 | #define LOOP_RDY(ha) (!LOOP_NOT_READY(ha)) | 2349 | #define LOOP_RDY(ha) (!LOOP_NOT_READY(ha)) |
2350 | 2350 | ||
2351 | #define TGT_Q(ha, t) (ha->otgt[t]) | 2351 | #define TGT_Q(ha, t) (ha->otgt[t]) |