sym2: remove dead SYM_OPT_HANDLE_IO_TIMEOUT code
PATCH 1/1 sym2: remove dead SYM_OPT_HANDLE_IO_TIMEOUT code
this was used only by ancient BSDs that didn't have timeout handling in the midlayer.
drivers/scsi/sym53c8xx_2/sym_hipd.c +0 -31
@@ -1630,13 +1630,6 @@#endif /* -* Optionnaly, set the IO timeout condition. -*/ -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -sym_timeout_ccb (np, cp,sym_cam_timeout (cp->cam_ccb)); -#endif - -/* * Insert first the idle task and then our job. * The MBs should ensure proper ordering. */
@@ -4960,13 +4953,6 @@sym_remque (&cp->link_ccbq);sym_insque_head (&cp->link_ccbq, &np->free_ccbq); -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -/* -* Cancel any pending timeout condition. -*/ -sym_untimeout_ccb (np, cp); -#endif -#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING if (lp) {sym_remque (&cp->link2_ccbq);
@@ -5053,9 +5039,6 @@/* * Chain into optionnal lists. */ -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -sym_insque_head (&cp->tmo_linkq, &np->tmo0_ccbq); -#endif #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING sym_insque_head (&cp->link2_ccbq, &np->dummy_ccbq);#endif
@@ -5818,14 +5801,6 @@* Initializations for optional handling * of IO timeouts and device queueing. */ -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -sym_que_init (&np->tmo0_ccbq); - np->tmo_ccbq = -sym_calloc (2 *SYM_CONF_TIMEOUT_ORDER_MAX *sizeof (SYM_QUEHEAD ), -"TMO_CCBQ" ); -for (i =0 ; i <2 *SYM_CONF_TIMEOUT_ORDER_MAX ; i++) -sym_que_init (&np->tmo_ccbq[i]); -#endif #ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING sym_que_init (&np->dummy_ccbq);#endif
@@ -5971,12 +5946,6 @@sym_mfree_dma (np->scriptb0, np->scriptb_sz,"SCRIPTB0" );if (np->scripta0)sym_mfree_dma (np->scripta0, np->scripta_sz,"SCRIPTA0" ); -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -if (np->tmo_ccbq) -sym_mfree (np->tmo_ccbq, -2 *SYM_CONF_TIMEOUT_ORDER_MAX *sizeof (SYM_QUEHEAD ), -"TMO_CCBQ" ); -#endif if (np->squeue)sym_mfree_dma (np->squeue,sizeof (u32)*(MAX_QUEUE *2 ),"SQUEUE" );if (np->dqueue)
===== drivers/scsi/sym53c8xx_2/sym_hipd.h 1.8 vs edited =====
drivers/scsi/sym53c8xx_2/sym_hipd.h +0 -27
@@ -796,10 +796,6 @@/* * Other fields. */ -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -SYM_QUEHEAD tmo_linkq;/* Optional timeout handling */ -u_int tmo_clock;/* (link and dealine value) */ -#endif u32 ccb_ba;/* BUS address of this CCB */ u_short tag;/* Tag for this transfer */ /* NO_TAG means no tag */
@@ -1025,15 +1004,6 @@#ifdef SYM_OPT_HANDLE_DEVICE_QUEUEING SYM_QUEHEAD dummy_ccbq;#endif -/* -* Optional handling of IO timeouts. -*/ -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -SYM_QUEHEAD tmo0_ccbq; -SYM_QUEHEAD *tmo_ccbq;/* [2*SYM_TIMEOUT_ORDER_MAX] */ -u_int tmo_clock; -u_int tmo_actq; -#endif /* * IMMEDIATE ARBITRATION (IARB) control.
@@ -1111,20 +1081,6 @@int sym_hcb_attach (hcb_p np,struct sym_fw *fw,struct sym_nvram *nvram);/* -* Optionnaly, the driver may handle IO timeouts. -*/ -#ifdef SYM_OPT_HANDLE_IO_TIMEOUT -int sym_abort_ccb (hcb_p np,ccb_p cp,int timed_out); -void sym_timeout_ccb (hcb_p np,ccb_p cp,u_int ticks); -static void __inlinesym_untimeout_ccb (hcb_p np,ccb_p cp) -{ -sym_remque (&cp->tmo_linkq); -sym_insque_head (&cp->tmo_linkq, &np->tmo0_ccbq); -} -void sym_clock (hcb_p np); -#endif /* SYM_OPT_HANDLE_IO_TIMEOUT */ - -/* * Optionnaly, the driver may provide a function * to announce transfer rate changes. */
drivers/scsi/sym53c8xx_2/sym_misc.c +0 -92
98 lines not on this page · raw message
Quoted 2 lines · Christoph Hellwig
this was used only by ancient BSDs that didn't have timeout handling in the midlayer.
Thanks. Applied a superset of this patch (also deleted SYM_CONF_TIMEOUT_ORDER_MAX).
Signature · 6 lines
"Next the statesmen will invent cheap lies, putting the blame upon the nation that is attacked, and every man will be glad of those conscience-soothing falsities, and will diligently study them, and refuse to examine any refutations of them; and thus he will by and by convince himself that the war is just, and will thank God for the better sleep he enjoys after this process of grotesque self-deception." -- Mark Twain