diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-11-12 16:11:59 +1100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-11-20 09:11:09 +0100 |
| commit | a9c2dc43c14cc9e9333d451bc4db8a827a695332 (patch) | |
| tree | 70e239cb8ebf6f09fa6d4c37cb3cc2884a37d144 /drivers/scsi/arm | |
| parent | 8c32513bd395dc5d382e4883097482567cf8bbc5 (diff) | |
| download | linux-a9c2dc43c14cc9e9333d451bc4db8a827a695332.tar.gz | |
ncr5380: Move static PDMA spin counters to host data
Static variables from dtc.c and pas16.c should not appear in the core
NCR5380.c driver. Aside from being a layering issue this worsens the
divergence between the three core driver variants (atari_NCR5380.c and
sun3_NCR5380.c don't support PSEUDO_DMA) and it can mean multiple hosts
share the same counters.
Fix this by making the pseudo DMA spin counters in the core more generic.
This also avoids the abuse of the {DTC,PAS16}_PUBLIC_RELEASE macros, so
they can be removed.
oak.c doesn't use PDMA and hence it doesn't use the counters and hence it
needs no write_info() method. Remove it.
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/arm')
| -rw-r--r-- | drivers/scsi/arm/oak.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index a5ef3f79a2fd..840a53dc556e 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c @@ -31,7 +31,6 @@ #define NCR5380_queue_command oakscsi_queue_command #define NCR5380_info oakscsi_info #define NCR5380_show_info oakscsi_show_info -#define NCR5380_write_info oakscsi_write_info #define NCR5380_implementation_fields \ void __iomem *base @@ -108,7 +107,6 @@ printk("reading %p len %d\n", addr, len); static struct scsi_host_template oakscsi_template = { .module = THIS_MODULE, .show_info = oakscsi_show_info, - .write_info = oakscsi_write_info, .name = "Oak 16-bit SCSI", .info = oakscsi_info, .queuecommand = oakscsi_queue_command, |