diff options
author | Andrew Vasquez <andrew.vasquez@qlogic.com> | 2005-04-23 02:47:27 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-20 13:53:25 -0400 |
commit | 354d6b2196c8e53e55e8f169804256ab9c72731d (patch) | |
tree | 2bdbd7618c154ab2614e6d1573cd0c348072d370 /drivers/scsi/qla2xxx/qla_def.h | |
parent | b86fff7368b139171edab66972ea1309092f519e (diff) |
[SCSI] remove some dead code in qla2xxx
Original from: Christoph Hellwig <hch@lst.de>
Modified and
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 | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 7d47b8d92047..83a32e403e29 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -252,31 +252,12 @@ typedef struct srb { | |||
252 | /* Request state */ | 252 | /* Request state */ |
253 | uint16_t state; | 253 | uint16_t state; |
254 | 254 | ||
255 | /* Timing counts. */ | ||
256 | unsigned long e_start; /* Start of extend timeout */ | ||
257 | unsigned long r_start; /* Start of request */ | ||
258 | unsigned long u_start; /* When sent to RISC */ | ||
259 | unsigned long f_start; /* When placed in FO queue*/ | ||
260 | |||
261 | /* Single transfer DMA context */ | 255 | /* Single transfer DMA context */ |
262 | dma_addr_t dma_handle; | 256 | dma_addr_t dma_handle; |
263 | 257 | ||
264 | uint32_t request_sense_length; | 258 | uint32_t request_sense_length; |
265 | uint8_t *request_sense_ptr; | 259 | uint8_t *request_sense_ptr; |
266 | 260 | ||
267 | int ext_history; | ||
268 | |||
269 | /* Suspend delay */ | ||
270 | int delay; | ||
271 | |||
272 | /* Raw completion info for use by failover ? */ | ||
273 | uint8_t fo_retry_cnt; /* Retry count this request */ | ||
274 | uint8_t err_id; /* error id */ | ||
275 | #define SRB_ERR_PORT 1 /* Request failed -- "port down" */ | ||
276 | #define SRB_ERR_LOOP 2 /* Request failed -- "loop down" */ | ||
277 | #define SRB_ERR_DEVICE 3 /* Request failed -- "device error" */ | ||
278 | #define SRB_ERR_OTHER 4 | ||
279 | |||
280 | /* SRB magic number */ | 261 | /* SRB magic number */ |
281 | uint16_t magic; | 262 | uint16_t magic; |
282 | #define SRB_MAGIC 0x10CB | 263 | #define SRB_MAGIC 0x10CB |
@@ -2082,23 +2063,8 @@ typedef struct scsi_qla_host { | |||
2082 | uint32_t current_outstanding_cmd; | 2063 | uint32_t current_outstanding_cmd; |
2083 | srb_t *status_srb; /* Status continuation entry. */ | 2064 | srb_t *status_srb; /* Status continuation entry. */ |
2084 | 2065 | ||
2085 | unsigned long last_irq_cpu; /* cpu where we got our last irq */ | ||
2086 | |||
2087 | uint16_t revision; | 2066 | uint16_t revision; |
2088 | uint8_t ports; | 2067 | uint8_t ports; |
2089 | u_long actthreads; | ||
2090 | u_long ipreq_cnt; | ||
2091 | u_long qthreads; | ||
2092 | |||
2093 | uint32_t total_isr_cnt; /* Interrupt count */ | ||
2094 | uint32_t total_isp_aborts; /* controller err cnt */ | ||
2095 | uint32_t total_lip_cnt; /* LIP cnt */ | ||
2096 | uint32_t total_dev_errs; /* device error cnt */ | ||
2097 | uint32_t total_ios; /* IO cnt */ | ||
2098 | uint64_t total_bytes; /* xfr byte cnt */ | ||
2099 | uint32_t total_mbx_timeout; /* mailbox timeout cnt */ | ||
2100 | uint32_t total_loop_resync; /* loop resyn cnt */ | ||
2101 | uint32_t dropped_frame_error_cnt; | ||
2102 | 2068 | ||
2103 | /* ISP configuration data. */ | 2069 | /* ISP configuration data. */ |
2104 | uint16_t loop_id; /* Host adapter loop id */ | 2070 | uint16_t loop_id; /* Host adapter loop id */ |
@@ -2124,8 +2090,6 @@ typedef struct scsi_qla_host { | |||
2124 | #define P2P_LOOP 3 | 2090 | #define P2P_LOOP 3 |
2125 | 2091 | ||
2126 | uint8_t marker_needed; | 2092 | uint8_t marker_needed; |
2127 | uint8_t sns_retry_cnt; | ||
2128 | uint8_t mem_err; | ||
2129 | 2093 | ||
2130 | uint8_t interrupts_on; | 2094 | uint8_t interrupts_on; |
2131 | 2095 | ||
@@ -2138,16 +2102,11 @@ typedef struct scsi_qla_host { | |||
2138 | uint16_t nvram_base; | 2102 | uint16_t nvram_base; |
2139 | 2103 | ||
2140 | uint16_t loop_reset_delay; | 2104 | uint16_t loop_reset_delay; |
2141 | uint16_t minimum_timeout; | ||
2142 | uint8_t retry_count; | 2105 | uint8_t retry_count; |
2143 | uint8_t login_timeout; | 2106 | uint8_t login_timeout; |
2144 | uint16_t r_a_tov; | 2107 | uint16_t r_a_tov; |
2145 | int port_down_retry_count; | 2108 | int port_down_retry_count; |
2146 | uint8_t loop_down_timeout; | ||
2147 | uint8_t mbx_count; | 2109 | uint8_t mbx_count; |
2148 | uint16_t max_probe_luns; | ||
2149 | uint16_t max_luns; | ||
2150 | uint16_t max_targets; | ||
2151 | uint16_t last_loop_id; | 2110 | uint16_t last_loop_id; |
2152 | 2111 | ||
2153 | uint32_t login_retry_count; | 2112 | uint32_t login_retry_count; |
@@ -2181,7 +2140,6 @@ typedef struct scsi_qla_host { | |||
2181 | uint8_t dpc_active; /* DPC routine is active */ | 2140 | uint8_t dpc_active; /* DPC routine is active */ |
2182 | 2141 | ||
2183 | /* Timeout timers. */ | 2142 | /* Timeout timers. */ |
2184 | uint8_t queue_restart_timer; | ||
2185 | uint8_t loop_down_abort_time; /* port down timer */ | 2143 | uint8_t loop_down_abort_time; /* port down timer */ |
2186 | atomic_t loop_down_timer; /* loop down timer */ | 2144 | atomic_t loop_down_timer; /* loop down timer */ |
2187 | uint8_t link_down_timeout; /* link down timeout */ | 2145 | uint8_t link_down_timeout; /* link down timeout */ |
@@ -2230,18 +2188,6 @@ typedef struct scsi_qla_host { | |||
2230 | 2188 | ||
2231 | mbx_cmd_t mc; | 2189 | mbx_cmd_t mc; |
2232 | 2190 | ||
2233 | uint8_t *cmdline; | ||
2234 | |||
2235 | uint32_t failover_type; | ||
2236 | uint32_t failback_delay; | ||
2237 | unsigned long cfg_flags; | ||
2238 | #define CFG_ACTIVE 0 /* CFG during a failover, event update, or ioctl */ | ||
2239 | #define CFG_FAILOVER 1 /* CFG during path change */ | ||
2240 | |||
2241 | uint32_t binding_type; | ||
2242 | #define BIND_BY_PORT_NAME 0 | ||
2243 | #define BIND_BY_PORT_ID 1 | ||
2244 | |||
2245 | /* Basic firmware related information. */ | 2191 | /* Basic firmware related information. */ |
2246 | struct qla_board_info *brd_info; | 2192 | struct qla_board_info *brd_info; |
2247 | uint16_t fw_major_version; | 2193 | uint16_t fw_major_version; |
@@ -2274,12 +2220,6 @@ typedef struct scsi_qla_host { | |||
2274 | uint8_t nvram_version; | 2220 | uint8_t nvram_version; |
2275 | uint32_t isp_abort_cnt; | 2221 | uint32_t isp_abort_cnt; |
2276 | 2222 | ||
2277 | /* Adapter I/O statistics for failover */ | ||
2278 | uint64_t IosRequested; | ||
2279 | uint64_t BytesRequested; | ||
2280 | uint64_t IosExecuted; | ||
2281 | uint64_t BytesExecuted; | ||
2282 | |||
2283 | /* Needed for BEACON */ | 2223 | /* Needed for BEACON */ |
2284 | uint16_t beacon_blink_led; | 2224 | uint16_t beacon_blink_led; |
2285 | uint16_t beacon_green_on; | 2225 | uint16_t beacon_green_on; |