diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2016-03-23 06:10:19 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-04-11 16:57:09 -0400 |
commit | 8053b0ee79c0129e827ce8f222398ff4b332dfd7 (patch) | |
tree | 31133745a821dfe3d6060cc2a8c27294d51fff89 /drivers/scsi/arm/oak.c | |
parent | 438af51c642926f1c1844846bee1c3fb568dcd64 (diff) |
ncr5380: Merge DMA implementation from atari_NCR5380 core driver
Adopt the DMA implementation from atari_NCR5380.c. This means that
atari_scsi and sun3_scsi can make use of the NCR5380.c core driver
and the atari_NCR5380.c driver fork can be made redundant.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/arm/oak.c')
-rw-r--r-- | drivers/scsi/arm/oak.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c index 05cf874fc739..3aac99c21267 100644 --- a/drivers/scsi/arm/oak.c +++ b/drivers/scsi/arm/oak.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #define NCR5380_dma_xfer_len(instance, cmd, phase) (0) | 26 | #define NCR5380_dma_xfer_len(instance, cmd, phase) (0) |
27 | #define NCR5380_dma_recv_setup oakscsi_pread | 27 | #define NCR5380_dma_recv_setup oakscsi_pread |
28 | #define NCR5380_dma_send_setup oakscsi_pwrite | 28 | #define NCR5380_dma_send_setup oakscsi_pwrite |
29 | #define NCR5380_dma_residual(instance) (0) | ||
29 | 30 | ||
30 | #define NCR5380_queue_command oakscsi_queue_command | 31 | #define NCR5380_queue_command oakscsi_queue_command |
31 | #define NCR5380_info oakscsi_info | 32 | #define NCR5380_info oakscsi_info |
@@ -144,7 +145,7 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
144 | host->irq = NO_IRQ; | 145 | host->irq = NO_IRQ; |
145 | host->n_io_port = 255; | 146 | host->n_io_port = 255; |
146 | 147 | ||
147 | ret = NCR5380_init(host, FLAG_DMA_FIXUP); | 148 | ret = NCR5380_init(host, FLAG_DMA_FIXUP | FLAG_LATE_DMA_SETUP); |
148 | if (ret) | 149 | if (ret) |
149 | goto out_unmap; | 150 | goto out_unmap; |
150 | 151 | ||