kill old EH constants
Subsystems (3)
PATCH 1/1 kill old EH constants
Fix up two drivers that incorrectly were using the old return values for their new-style EH methods and kill off scsi_obsolete.h that defined the constants. The initio driver has all these constansts defined locally and uses them internally, I'll fix that up some time later.
drivers/scsi/scsi.h +0 -6
@@ -60,12 +60,6 @@#define scsi_to_pci_dma_dir (scsi_dir) ((int)(scsi_dir))#define scsi_to_sbus_dma_dir (scsi_dir) ((int)(scsi_dir)) -/* -* This is the crap from the old error handling code. We have it in a special -* place so that we can more easily delete it later on. -*/ -#include "scsi_obsolete.h" -/* obsolete typedef junk. */ #include "scsi_typedefs.h"
drivers/scsi/scsi_obsolete.h +0 -106
106 lines not on this page · raw message
===== drivers/scsi/ultrastor.c 1.25 vs edited =====
drivers/scsi/ultrastor.c +2 -2
@@ -945,7 +945,7 @@ config.mscp[mscp_index].SCint, SCpnt);#endif if (config.mscp[mscp_index].SCint ==0 ) -return SCSI_ABORT_NOT_RUNNING ; +return FAILURE ;if (config.mscp[mscp_index].SCint != SCpnt)panic ("Bad abort" ); config.mscp[mscp_index].SCint =NULL ;
@@ -1020,7 +1020,7 @@#endif spin_unlock_irqrestore (host->host_lock, flags); -return SCSI_RESET_SUCCESS ; +return SUCCESS ; }
drivers/usb/image/microtek.c +1 -1
@@ -335,7 +335,7 @@mts_urb_abort (desc); -return SCSI_ABORT_PENDING ; +return FAILURE ; }static int mts_scsi_host_reset (Scsi_Cmnd *srb)