tmscsim EH fixes
PATCH 1/1 tmscsim EH fixes
- there's a few places doing command completion from the error handler because if checks for USE_NEW_EH which isn't defined for us, remove those
- the reset and abort routines still return the old EH return values, fixed
- streamlined the abort/reset routines and made them more easily readable
- switch to <scsi/scsi*.h> includes now that the old EH retvals are gone
- kill dc390.h
(needs the two previous patches)
drivers/scsi/dc390.h +0 -32
@@ -1,32 +0,0 @@ -/*********************************************************************** -* FILE NAME : DC390.H * -* BY : C.L. Huang * -* Description: Device Driver for Tekram DC-390(T) PCI SCSI * -* Bus Master Host Adapter * -***********************************************************************/ -/* $Id: dc390.h,v 2.43.2.22 2000/12/20 00:39:36 garloff Exp $ */ - -/* -* DC390/AMD 53C974 driver, header file -*/ - -#ifndef DC390_H -#define DC390_H - -#include <linux/version.h> - -#define DC390_BANNER "Tekram DC390/AM53C974" -#define DC390_VERSION "2.1d 2004-05-27" - -/* We don't have eh_abort_handler, eh_device_reset_handler, -* eh_bus_reset_handler, eh_host_reset_handler yet! -* So long: Use old exception handling :-( */ -#define OLD_EH - -#if LINUX_VERSION_CODE <KERNEL_VERSION (2 ,1 ,70 ) || defined (OLD_EH ) -# define NEW_EH -#else -# define NEW_EH use_new_eh_code: 1, -# define USE_NEW_EH -#endif -#endif /* DC390_H */
drivers/scsi/scsiiom.c +0 -12
@@ -1586,18 +1586,6 @@ psrb2 = psrb->pNextSRB; pcmd = psrb->pcmd;dc390_Free_insert (pACB, psrb); -#ifndef USE_NEW_EH -/* New EH will crash on being given timed out cmnds */ -if (pcmd == cmd) - pcmd->result =MK_RES (0 ,DID_ABORT ,0 ,0 ); -else - pcmd->result =MK_RES (0 ,DID_RESET ,0 ,0 ); - -/* ReleaseSRB( pDCB, pSRB ); */ - -DEBUG0 (printk (KERN_DEBUG "DC390: DoingSRB_Done: done pid %li\n" , pcmd->pid)); - pcmd->scsi_done ( pcmd ); -#endif psrb = psrb2; } pdcb->GoingSRBCnt =0 ;
drivers/scsi/tmscsim.c +66 -220
340 lines not on this page · raw message