sym2: remove SYM_OPT_HANDLE_DEVICE_QUEUEING code
PATCH 1/1 sym2: remove SYM_OPT_HANDLE_DEVICE_QUEUEING code
All per-device queueing is handled by the scsi midlayer for quite a while so we can remove the code to deal with it. It has been completly disabled at the cpp level already.
Signed-off-by Christoph Hellwig <[email protected]>
drivers/scsi/sym53c8xx_2/sym_glue.h +0 -1
@@ -67,7 +67,6 @@*/ #define SYM_CONF_TIMER_INTERVAL ((HZ+1)/2) -#undef SYM_OPT_HANDLE_DEVICE_QUEUEING#define SYM_OPT_LIMIT_COMMAND_REORDERING /*
drivers/scsi/sym53c8xx_2/sym_hipd.c +0 -194
308 lines not on this page · raw message
drivers/scsi/sym53c8xx_2/sym_hipd.h +0 -31
@@ -48,17 +48,12 @@* They may be defined in platform specific headers, if they * are useful. * -* SYM_OPT_HANDLE_DEVICE_QUEUEING -* When this option is set, the driver will use a queue per -* device and handle QUEUE FULL status requeuing internally. -* * SYM_OPT_LIMIT_COMMAND_REORDERING * When this option is set, the driver tries to limit tagged * command reordering to some reasonnable value. * (set for Linux) */ #if 0 -#define SYM_OPT_HANDLE_DEVICE_QUEUEING #define SYM_OPT_LIMIT_COMMAND_REORDERING #endif
@@ -508,20 +503,6 @@struct sym_slcb s;#endif -#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING -/* -* Optionnaly the driver can handle device queueing, -* and requeues internally command to redo. -*/ -SYM_QUEHEAD waiting_ccbq; -SYM_QUEHEAD started_ccbq; -int num_sgood; -u_short started_tags; -u_short started_no_tag; -u_short started_max; -u_short started_limit; -#endif -#ifdef SYM_OPT_LIMIT_COMMAND_REORDERING /* * Optionally the driver can try to prevent SCSI
@@ -785,10 +766,6 @@u32 goalp;/* Expected last data pointer */ int ext_sg;/* Extreme data pointer, used */ int ext_ofs;/* to calculate the residual. */ -#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING -SYM_QUEHEAD link2_ccbq;/* Link for device queueing */ -u_char started;/* CCB queued to the squeue */ -#endif u_char to_abort;/* Want this IO to be aborted */ #ifdef SYM_OPT_LIMIT_COMMAND_REORDERING u_char tags_si;/* Lun tags sum index (0,1) */
@@ -987,10 +964,6 @@*/ SYM_QUEHEAD comp_ccbq; -#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING -SYM_QUEHEAD dummy_ccbq; -#endif -/* * IMMEDIATE ARBITRATION (IARB) control. *
@@ -1047,11 +1020,7 @@void sym_print_xerr (struct scsi_cmnd *cmd,int x_status);int sym_reset_scsi_bus (struct sym_hcb *np,int enab_int);struct sym_chip *sym_lookup_chip_table (u_short device_id,u_char revision); -#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING -void sym_start_next_ccbs (struct sym_hcb *np,struct sym_lcb *lp,int maxn); -#else void sym_put_start_queue (struct sym_hcb *np,struct sym_ccb *cp); -#endif void sym_start_up (struct sym_hcb *np,int reason);void sym_interrupt (struct sym_hcb *np);int sym_clear_tasks (struct sym_hcb *np,int cam_status,int target,int lun,int task);