---

yaml --- r: 209 b: refs/heads/master c: 2bc474c h: refs/heads/master i: 207: e4d0fec v: v3
git-mirror · Apr 18, 2005 · 48997dc · 48997dc
1 parent 40142f2
commit 48997dc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 116 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6295cdf656de63d6d1123def71daba6cd91939c
+refs/heads/master: 2bc474c3646efba67bdc83b7fc7d8ee7562e0106
diff --git a/trunk/drivers/scsi/scsi.h b/trunk/drivers/scsi/scsi.h
@@ -60,12 +60,6 @@ struct scatterlist;
 #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"
 

diff --git a/trunk/drivers/scsi/scsi_obsolete.h b/trunk/drivers/scsi/scsi_obsolete.h
diff --git a/trunk/drivers/scsi/ultrastor.c b/trunk/drivers/scsi/ultrastor.c
@@ -945,7 +945,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt)
 	       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 @@ static int ultrastor_host_reset(Scsi_Cmnd * SCpnt)
 #endif
 
     spin_unlock_irqrestore(host->host_lock, flags);
-    return SCSI_RESET_SUCCESS;
+    return SUCCESS;
 
 }
 

diff --git a/trunk/drivers/usb/image/microtek.c b/trunk/drivers/usb/image/microtek.c
@@ -335,7 +335,7 @@ static int mts_scsi_abort (Scsi_Cmnd *srb)
 
 	mts_urb_abort(desc);
 
-	return SCSI_ABORT_PENDING;
+	return FAILURE;
 }
 
 static int mts_scsi_host_reset (Scsi_Cmnd *srb)