aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mac_scsi.c
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2014-11-12 00:12:19 -0500
committerChristoph Hellwig <hch@lst.de>2014-11-20 03:11:19 -0500
commitca513fc948e66ecdd3c75cca9371762bb4c06776 (patch)
tree354d51b6c7ffdc8390d4820a7d145d3785ed2a85 /drivers/scsi/mac_scsi.c
parentff50f9ed0fcae6c890cc6d478814ec8cbb24feb1 (diff)
atari_NCR5380: Introduce FLAG_TAGGED_QUEUING
The static variable setup_use_tagged_queuing is declared in mac_scsi.c, sun3_scsi.c and atari_scsi.c and doesn't belong in the core driver. None of the other NCR5380 drivers suffer from this layering issue which makes merging the core drivers more difficult and will likely hinder plans for future use of platform data to configure the driver. Replace the static variable with a host flag. This way it can be reported along with the other flags. 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/mac_scsi.c')
-rw-r--r--drivers/scsi/mac_scsi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 030f3b0bb53b..953fd9b953c7 100644
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -411,10 +411,6 @@ static int __init mac_scsi_probe(struct platform_device *pdev)
411 mac_scsi_template.sg_tablesize = setup_sg_tablesize; 411 mac_scsi_template.sg_tablesize = setup_sg_tablesize;
412 if (setup_hostid >= 0) 412 if (setup_hostid >= 0)
413 mac_scsi_template.this_id = setup_hostid & 7; 413 mac_scsi_template.this_id = setup_hostid & 7;
414#ifdef SUPPORT_TAGS
415 if (setup_use_tagged_queuing < 0)
416 setup_use_tagged_queuing = 0;
417#endif
418 if (setup_use_pdma < 0) 414 if (setup_use_pdma < 0)
419 setup_use_pdma = 0; 415 setup_use_pdma = 0;
420 416
@@ -440,6 +436,10 @@ static int __init mac_scsi_probe(struct platform_device *pdev)
440 mac_scsi_reset_boot(instance); 436 mac_scsi_reset_boot(instance);
441#endif 437#endif
442 438
439#ifdef SUPPORT_TAGS
440 host_flags |= setup_use_tagged_queuing > 0 ? FLAG_TAGGED_QUEUING : 0;
441#endif
442
443 NCR5380_init(instance, host_flags); 443 NCR5380_init(instance, host_flags);
444 444
445 if (instance->irq != NO_IRQ) { 445 if (instance->irq != NO_IRQ) {