ncr5380: Remove redundant AUTOSENSE macro

Every NCR5380 driver sets AUTOSENSE so it need not be optional (and the
mid-layer expects it). Remove this redundant macro to improve readability.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

14 files changed, 3 insertions, 69 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 0a8786acddc3..e17e64e3e0d9 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -627,9 +627,6 @@ NCR5380_print_options(struct Scsi_Host *instance)
 #ifdef AUTOPROBE_IRQ
                " AUTOPROBE_IRQ"
 #endif
-#ifdef AUTOSENSE
-               " AUTOSENSE"
-#endif
 #ifdef DIFFERENTIAL
                " DIFFERENTIAL"
 #endif
@@ -857,12 +854,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)
         hostdata->host = instance;
         hostdata->time_expires = 0;
 
-#ifndef AUTOSENSE
-        if ((instance->cmd_per_lun > 1) || instance->can_queue > 1)
-                    printk(KERN_WARNING "scsi%d : WARNING : support for multiple outstanding commands enabled\n" "         without AUTOSENSE option, contingent allegiance conditions may\n"
-                           "         be incorrectly cleared.\n", instance->host_no);
-#endif                          /* def AUTOSENSE */
-
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
         NCR5380_write(MODE_REG, MR_BASE);
         NCR5380_write(TARGET_COMMAND_REG, 0);
@@ -2260,7 +2251,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                         else if (status_byte(cmd->SCp.Status) != GOOD)
                                                 cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
 
-#ifdef AUTOSENSE
                                         if ((cmd->cmnd[0] == REQUEST_SENSE) &&
                                                 hostdata->ses.cmd_len) {
                                                 scsi_eh_restore_cmnd(cmd, &hostdata->ses);
@@ -2277,9 +2267,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                                     hostdata->issue_queue;
                                                 hostdata->issue_queue = (Scsi_Cmnd *) cmd;
                                                 dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no);
-                                        } else
-#endif                          /* def AUTOSENSE */
-                                        {
+                                        } else {
                                                 collect_stats(hostdata, cmd);
                                                 cmd->scsi_done(cmd);
                                         }
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index b36e3b4a9d43..f09d560fb6b2 100644
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -25,10 +25,7 @@
 #define NCR5380_H
 
 #include <linux/interrupt.h>
-
-#ifdef AUTOSENSE
 #include <scsi/scsi_eh.h>
-#endif
 
 #define NCR5380_PUBLIC_RELEASE 7
 #define NCR53C400_PUBLIC_RELEASE 2
@@ -281,9 +278,7 @@ struct NCR5380_hostdata {
         unsigned pendingr;
         unsigned pendingw;
 #endif
-#ifdef AUTOSENSE
         struct scsi_eh_save ses;
-#endif
 };
 
 #ifdef __KERNEL__
diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 8ef810a4476e..8266039b60ee 100644
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -18,7 +18,6 @@
 
 #include <scsi/scsicam.h>
 
-#define AUTOSENSE
 #define PSEUDO_DMA
 
 #define CUMANASCSI_PUBLIC_RELEASE 1
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 5ba3db605000..f62cc904a47b 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -17,7 +17,6 @@
 #include "../scsi.h"
 #include <scsi/scsi_host.h>
 
-#define AUTOSENSE
 /*#define PSEUDO_DMA*/
 
 #define OAKSCSI_PUBLIC_RELEASE 1
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 3cfd39c583ad..f69d36327a7d 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -683,9 +683,6 @@ static inline void NCR5380_all_init(void)
 static void __init NCR5380_print_options(struct Scsi_Host *instance)
 {
         printk(" generic options"
-#ifdef AUTOSENSE
-               " AUTOSENSE"
-#endif
 #ifdef REAL_DMA
                " REAL DMA"
 #endif
@@ -842,13 +839,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
                 first_instance = instance;
         }
 
-#ifndef AUTOSENSE
-        if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
-                printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
-                       "        without AUTOSENSE option, contingent allegiance conditions may\n"
-                       "        be incorrectly cleared.\n", HOSTNO);
-#endif /* def AUTOSENSE */
-
         NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
         NCR5380_write(MODE_REG, MR_BASE);
         NCR5380_write(TARGET_COMMAND_REG, 0);
@@ -2199,7 +2189,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                         else if (status_byte(cmd->SCp.Status) != GOOD)
                                                 cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
 
-#ifdef AUTOSENSE
                                         if ((cmd->cmnd[0] == REQUEST_SENSE) &&
                                                 hostdata->ses.cmd_len) {
                                                 scsi_eh_restore_cmnd(cmd, &hostdata->ses);
@@ -2219,9 +2208,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                                 local_irq_restore(flags);
                                                 dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of "
                                                           "issue queue\n", H_NO(cmd));
-                                        } else
-#endif /* def AUTOSENSE */
-                                        {
+                                        } else {
 #ifdef NCR5380_STATS
                                                 collect_stats(hostdata, cmd);
 #endif
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index a68d6257bc68..9f4d58ca3647 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -67,7 +67,6 @@
 
 #include <linux/module.h>
 
-#define AUTOSENSE
 /* For the Atari version, use only polled IO or REAL_DMA */
 #define REAL_DMA
 /* Support tagged queuing? (on devices that are able to... :-) */
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 6d534b9ffc91..5101328656b8 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -33,7 +33,6 @@
 /*
  * Definitions for the generic 5380 driver.
  */
-#define AUTOSENSE
 
 #define NCR5380_read(reg)               inb(port + reg)
 #define NCR5380_write(reg, value)       outb(value, port + reg)
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c
index e890b08efbd8..975abbfe0bba 100644
--- a/drivers/scsi/dtc.c
+++ b/drivers/scsi/dtc.c
@@ -1,5 +1,4 @@
 
-#define AUTOSENSE
 #define PSEUDO_DMA
 #define DONT_USE_INTR
 #define UNSAFE                  /* Leave interrupts enabled during pseudo-dma I/O */
@@ -30,9 +29,6 @@
 
 /*
  * Options : 
- * AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
- *      for commands that return with a CHECK CONDITION status. 
- *
  * PSEUDO_DMA - enables PSEUDO-DMA hardware, should give a 3-4X performance
  * increase compared to polled I/O.
  *
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index c10466939a52..eda978f29d9d 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -80,8 +80,6 @@
 #define USLEEP_WAITLONG 500
 
 #define AUTOPROBE_IRQ
-#define AUTOSENSE
-
 
 #ifdef CONFIG_SCSI_GENERIC_NCR53C400
 #define NCR53C400_PSEUDO_DMA 1
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index aa372ec38507..3f125838a29d 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -48,8 +48,6 @@
 #include <scsi/scsi_host.h>
 #include "mac_scsi.h"
 
-/* These control the behaviour of the generic 5380 core */
-#define AUTOSENSE
 #define PSEUDO_DMA
 
 #include "NCR5380.h"
diff --git a/drivers/scsi/pas16.c b/drivers/scsi/pas16.c
index ffa399e7860a..7621205e4aa0 100644
--- a/drivers/scsi/pas16.c
+++ b/drivers/scsi/pas16.c
@@ -1,4 +1,3 @@
-#define AUTOSENSE
 #define PSEUDO_DMA
 #define UNSAFE  /* Not unsafe for PAS16 -- use it */
 #define PDEBUG 0
@@ -39,9 +38,6 @@
 
 /*
  * Options : 
- * AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
- *      for commands that return with a CHECK CONDITION status. 
- *
  * LIMIT_TRANSFERSIZE - if defined, limit the pseudo-dma transfers to 512
  *      bytes at a time.  Since interrupts are disabled by default during
  *      these transfers, we might need this to give reasonable interrupt
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 3586fecdc8bb..f52bda71dfb9 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -629,9 +629,6 @@ static inline void NCR5380_all_init (void)
 static void __init NCR5380_print_options (struct Scsi_Host *instance)
 {
     printk(" generic options"
-#ifdef AUTOSENSE 
-    " AUTOSENSE"
-#endif
 #ifdef REAL_DMA
     " REAL DMA"
 #endif
@@ -788,14 +785,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
         first_instance = instance;
     }
         
-
-#ifndef AUTOSENSE
-    if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
-         printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
-                "        without AUTOSENSE option, contingent allegiance conditions may\n"
-                "        be incorrectly cleared.\n", HOSTNO);
-#endif /* def AUTOSENSE */
-
     NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
     NCR5380_write(MODE_REG, MR_BASE);
     NCR5380_write(TARGET_COMMAND_REG, 0);
@@ -2161,7 +2150,6 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                     else if (status_byte(cmd->SCp.Status) != GOOD)
                         cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
                     
-#ifdef AUTOSENSE
                     if ((cmd->cmnd[0] == REQUEST_SENSE) &&
                                                 hostdata->ses.cmd_len) {
                         scsi_eh_restore_cmnd(cmd, &hostdata->ses);
@@ -2185,9 +2173,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                         local_irq_restore(flags);
                         dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of "
                                   "issue queue\n", H_NO(cmd));
-                   } else
-#endif /* def AUTOSENSE */
-                   {
+                   } else {
 #ifdef NCR5380_STATS
                        collect_stats(hostdata, cmd);
 #endif
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 30353f6b599c..a5e58a7373be 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -45,8 +45,6 @@
  * PARITY - enable parity checking.  Not supported.
  */
 
-#define AUTOSENSE
-
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/ctype.h>
diff --git a/drivers/scsi/t128.c b/drivers/scsi/t128.c
index f06ad91d737d..4253fe97c210 100644
--- a/drivers/scsi/t128.c
+++ b/drivers/scsi/t128.c
@@ -1,4 +1,3 @@
-#define AUTOSENSE
 #define PSEUDO_DMA
 
 /*
@@ -40,9 +39,6 @@
 
 /*
  * Options : 
- * AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
- *      for commands that return with a CHECK CONDITION status. 
- *
  * PSEUDO_DMA - enables PSEUDO-DMA hardware, should give a 3-4X performance
  * increase compared to polled I/O.
  *