diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2014-11-12 06:12:00 +0100 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-20 09:11:09 +0100 |
commit | d572f65fdf78a6dcb55b86ad8684f88830bf2e08 (patch) | |
tree | c2a690e481eabd36133589b0bd26d16e640dcf3a /drivers/scsi/sun3_scsi.c | |
parent | ncr5380: Move static PDMA spin counters to host data (diff) | |
download | linux-d572f65fdf78a6dcb55b86ad8684f88830bf2e08.tar.xz linux-d572f65fdf78a6dcb55b86ad8684f88830bf2e08.zip |
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>
Diffstat (limited to 'drivers/scsi/sun3_scsi.c')
-rw-r--r-- | drivers/scsi/sun3_scsi.c | 20 |
1 files changed, 10 insertions, 10 deletions
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 }; |