ncr5380: Remove pointless compiler command line override macros

Compile-time override of scsi host defaults is pointless for drivers that
provide module parameters and __setup options for that. Too many macros make
the code hard to read so remove them.

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>

6 files changed, 20 insertions, 58 deletions

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 1022a391c82a..0e3a9cc40c94 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -611,7 +611,7 @@ static int __init atari_scsi_detect(struct scsi_host_template *host)
 
 #ifdef SUPPORT_TAGS
         if (setup_use_tagged_queuing < 0)
-                setup_use_tagged_queuing = DEFAULT_USE_TAGGED_QUEUING;
+                setup_use_tagged_queuing = 0;
 #endif
 #ifdef REAL_DMA
         /* If running on a Falcon and if there's TT-Ram (i.e., more than one
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h
index 24e854590dc4..41b7cd7d36b8 100644
--- a/drivers/scsi/atari_scsi.h
+++ b/drivers/scsi/atari_scsi.h
@@ -36,9 +36,6 @@
 #define ATARI_FALCON_CMD_PER_LUN        1
 #define ATARI_FALCON_SG_TABLESIZE       SG_NONE
 
-#define DEFAULT_USE_TAGGED_QUEUING      0
-
-
 #define NCR5380_implementation_fields   /* none */
 
 #define NCR5380_read(reg)                 atari_scsi_reg_read( reg )
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index a27216d534ed..f00c987478ec 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -177,13 +177,12 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
     if (macintosh_config->scsi_type != MAC_SCSI_OLD)
         return( 0 );
 
-    /* setup variables */
-    tpnt->can_queue =
-        (setup_can_queue > 0) ? setup_can_queue : CAN_QUEUE;
-    tpnt->cmd_per_lun =
-        (setup_cmd_per_lun > 0) ? setup_cmd_per_lun : CMD_PER_LUN;
-    tpnt->sg_tablesize = 
-        (setup_sg_tablesize >= 0) ? setup_sg_tablesize : SG_TABLESIZE;
+        if (setup_can_queue > 0)
+                tpnt->can_queue = setup_can_queue;
+        if (setup_cmd_per_lun > 0)
+                tpnt->cmd_per_lun = setup_cmd_per_lun;
+        if (setup_sg_tablesize >= 0)
+                tpnt->sg_tablesize = setup_sg_tablesize;
 
     if (setup_hostid >= 0)
         tpnt->this_id = setup_hostid;
@@ -194,7 +193,7 @@ int __init macscsi_detect(struct scsi_host_template * tpnt)
 
 #ifdef SUPPORT_TAGS
     if (setup_use_tagged_queuing < 0)
-        setup_use_tagged_queuing = USE_TAGGED_QUEUING;
+        setup_use_tagged_queuing = 0;
 #endif
 
     /* Once we support multiple 5380s (e.g. DuoDock) we'll do
@@ -496,10 +495,10 @@ static struct scsi_host_template driver_template = {
         .queuecommand                   = macscsi_queue_command,
         .eh_abort_handler               = macscsi_abort,
         .eh_bus_reset_handler           = macscsi_bus_reset,
-        .can_queue                      = CAN_QUEUE,
+        .can_queue                      = 16,
         .this_id                        = 7,
         .sg_tablesize                   = SG_ALL,
-        .cmd_per_lun                    = CMD_PER_LUN,
+        .cmd_per_lun                    = 2,
         .use_clustering                 = DISABLE_CLUSTERING
 };
 
diff --git a/drivers/scsi/mac_scsi.h b/drivers/scsi/mac_scsi.h
index 66b34dbdc0d0..4eed4a75160b 100644
--- a/drivers/scsi/mac_scsi.h
+++ b/drivers/scsi/mac_scsi.h
@@ -17,22 +17,6 @@
 
 #ifndef ASM
 
-#ifndef CMD_PER_LUN
-#define CMD_PER_LUN 2
-#endif
-
-#ifndef CAN_QUEUE
-#define CAN_QUEUE 16
-#endif
-
-#ifndef SG_TABLESIZE
-#define SG_TABLESIZE SG_NONE
-#endif
-
-#ifndef USE_TAGGED_QUEUING
-#define USE_TAGGED_QUEUING 0
-#endif
-
 #include <scsi/scsicam.h>
 
 #define NCR5380_implementation_fields /* none */
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 9bae5f6122a7..12a991b19e58 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -198,12 +198,12 @@ static int __init sun3scsi_detect(struct scsi_host_template *tpnt)
 #endif
 
         /* setup variables */
-        tpnt->can_queue =
-                (setup_can_queue > 0) ? setup_can_queue : CAN_QUEUE;
-        tpnt->cmd_per_lun =
-                (setup_cmd_per_lun > 0) ? setup_cmd_per_lun : CMD_PER_LUN;
-        tpnt->sg_tablesize = 
-                (setup_sg_tablesize >= 0) ? setup_sg_tablesize : SG_TABLESIZE;
+        if (setup_can_queue > 0)
+                tpnt->can_queue = setup_can_queue;
+        if (setup_cmd_per_lun > 0)
+                tpnt->cmd_per_lun = setup_cmd_per_lun;
+        if (setup_sg_tablesize >= 0)
+                tpnt->sg_tablesize = setup_sg_tablesize;
 
         if (setup_hostid >= 0)
                 tpnt->this_id = setup_hostid;
@@ -257,7 +257,7 @@ static int __init sun3scsi_detect(struct scsi_host_template *tpnt)
 #endif
 #ifdef SUPPORT_TAGS
         if (setup_use_tagged_queuing < 0)
-                setup_use_tagged_queuing = USE_TAGGED_QUEUING;
+                setup_use_tagged_queuing = 1;
 #endif
 
         instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata));
@@ -683,10 +683,10 @@ static struct scsi_host_template driver_template = {
         .queuecommand           = sun3scsi_queue_command,
         .eh_abort_handler       = sun3scsi_abort,
         .eh_bus_reset_handler   = sun3scsi_bus_reset,
-        .can_queue              = CAN_QUEUE,
+        .can_queue              = 16,
         .this_id                = 7,
-        .sg_tablesize           = SG_TABLESIZE,
-        .cmd_per_lun            = CMD_PER_LUN,
+        .sg_tablesize           = SG_NONE,
+        .cmd_per_lun            = 2,
         .use_clustering         = DISABLE_CLUSTERING
 };
 
diff --git a/drivers/scsi/sun3_scsi.h b/drivers/scsi/sun3_scsi.h
index 3b8a05ca3625..d616c9539cec 100644
--- a/drivers/scsi/sun3_scsi.h
+++ b/drivers/scsi/sun3_scsi.h
@@ -31,25 +31,7 @@
 
 #define IOBASE_SUN3_VMESCSI 0xff200000
 
-#ifndef CMD_PER_LUN
-#define CMD_PER_LUN 2
-#endif
-
-#ifndef CAN_QUEUE
-#define CAN_QUEUE 16
-#endif
-
-#ifndef SG_TABLESIZE
-#define SG_TABLESIZE SG_NONE
-#endif
-
-#ifndef MAX_TAGS
 #define MAX_TAGS 32
-#endif
-
-#ifndef USE_TAGGED_QUEUING
-#define USE_TAGGED_QUEUING 1
-#endif
 
 #include <scsi/scsicam.h>