ncr5380: Remove FLAG_NO_PSEUDO_DMA where possible

Drivers that define PSEUDO_DMA also define NCR5380_dma_xfer_len.
The core driver must call NCR5380_dma_xfer_len which means
FLAG_NO_PSEUDO_DMA can be eradicated from the core driver.

dmx3191d doesn't define PSEUDO_DMA and has no use for FLAG_NO_PSEUDO_DMA,
so remove it there also.

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>

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 3eff2a69fe0806e281b521a1f7c1a1bfd22a42f4..98840bed05cbb970afb6d006c00f540032fc5ee8 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1833,8 +1833,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
 
 #if defined(PSEUDO_DMA) || defined(REAL_DMA_POLL)
                                transfersize = 0;
-                               if (!cmd->device->borken &&
-                                   !(hostdata->flags & FLAG_NO_PSEUDO_DMA))
+                               if (!cmd->device->borken)
                                        transfersize = NCR5380_dma_xfer_len(instance, cmd, phase);
 
                                if (transfersize) {

diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 6c14e68b9e1a80aab149ed3f7556ce3e22de7280..e9e96af96104ee3bd2330248791ef9dbdb40412f 100644 (file)
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -93,7 +93,7 @@ static int dmx3191d_probe_one(struct pci_dev *pdev,
         */
        shost->irq = NO_IRQ;
 
-       error = NCR5380_init(shost, FLAG_NO_PSEUDO_DMA);
+       error = NCR5380_init(shost, 0);
        if (error)
                goto out_host_put;
 

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 85ebe109d15d4487f19572f18460a542515e87d1..b8fc26d9231d2e88d96880f71f90949fb2a05c2f 100644 (file)
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -712,10 +712,15 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
        return 0;
 }
 
-static int generic_NCR5380_dma_xfer_len(struct scsi_cmnd *cmd)
+static int generic_NCR5380_dma_xfer_len(struct Scsi_Host *instance,
+                                        struct scsi_cmnd *cmd)
 {
+       struct NCR5380_hostdata *hostdata = shost_priv(instance);
        int transfersize = cmd->transfersize;
 
+       if (hostdata->flags & FLAG_NO_PSEUDO_DMA)
+               return 0;
+
        /* Limit transfers to 32K, for xx400 & xx406
         * pseudoDMA that transfers in 128 bytes blocks.
         */

diff --git a/drivers/scsi/g_NCR5380.h b/drivers/scsi/g_NCR5380.h
index 1ca3743a887eb0ef21fb340546b4a771f776f4c9..3fb0d85294290818a73d17038952bebaed8b897a 100644 (file)
--- a/drivers/scsi/g_NCR5380.h
+++ b/drivers/scsi/g_NCR5380.h
@@ -61,7 +61,7 @@
 #endif
 
 #define NCR5380_dma_xfer_len(instance, cmd, phase) \
-        generic_NCR5380_dma_xfer_len(cmd)
+        generic_NCR5380_dma_xfer_len(instance, cmd)
 
 #define NCR5380_intr generic_NCR5380_intr
 #define NCR5380_queue_command generic_NCR5380_queue_command

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index bb2381314a2bfe91c1552f4f257dc41919014aac..a8f5433b515eb4b4bcac684af572798965bfe5ad 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -37,7 +37,9 @@
 
 #define NCR5380_pread                   macscsi_pread
 #define NCR5380_pwrite                  macscsi_pwrite
-#define NCR5380_dma_xfer_len(instance, cmd, phase)     (cmd->transfersize)
+
+#define NCR5380_dma_xfer_len(instance, cmd, phase) \
+        macscsi_dma_xfer_len(instance, cmd)
 
 #define NCR5380_intr                    macscsi_intr
 #define NCR5380_queue_command           macscsi_queue_command
@@ -303,6 +305,17 @@ static int macscsi_pwrite(struct Scsi_Host *instance,
 }
 #endif
 
+static int macscsi_dma_xfer_len(struct Scsi_Host *instance,
+                                struct scsi_cmnd *cmd)
+{
+       struct NCR5380_hostdata *hostdata = shost_priv(instance);
+
+       if (hostdata->flags & FLAG_NO_PSEUDO_DMA)
+               return 0;
+
+       return cmd->transfersize;
+}
+
 #include "NCR5380.c"
 
 #define DRV_MODULE_NAME         "mac_scsi"