p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Finn Thain 2016-03-23 21:10:11 +11:00 committed by Martin K. Petersen
parent 9d376402c8
commit 7e9ec8d9cc
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/NCR5380.c
View File

@ -1833,8 +1833,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
#if defined(PSEUDO_DMA) || defined(REAL_DMA_POLL) #if defined(PSEUDO_DMA) || defined(REAL_DMA_POLL)
transfersize = 0; transfersize = 0;
if (!cmd->device->borken && if (!cmd->device->borken)
!(hostdata->flags & FLAG_NO_PSEUDO_DMA))
transfersize = NCR5380_dma_xfer_len(instance, cmd, phase); transfersize = NCR5380_dma_xfer_len(instance, cmd, phase);
if (transfersize) { if (transfersize) {

2
drivers/scsi/dmx3191d.c
View File

@ -93,7 +93,7 @@ static int dmx3191d_probe_one(struct pci_dev *pdev,
*/ */
shost->irq = NO_IRQ; shost->irq = NO_IRQ;
error = NCR5380_init(shost, FLAG_NO_PSEUDO_DMA); error = NCR5380_init(shost, 0);
if (error) if (error)
goto out_host_put; goto out_host_put;

7
drivers/scsi/g_NCR5380.c
View File

@ -712,10 +712,15 @@ static inline int NCR5380_pwrite(struct Scsi_Host *instance, unsigned char *src,
return 0; 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; int transfersize = cmd->transfersize;
if (hostdata->flags & FLAG_NO_PSEUDO_DMA)
return 0;
/* Limit transfers to 32K, for xx400 & xx406 /* Limit transfers to 32K, for xx400 & xx406
* pseudoDMA that transfers in 128 bytes blocks. * pseudoDMA that transfers in 128 bytes blocks.
*/ */

2
drivers/scsi/g_NCR5380.h
View File

@ -61,7 +61,7 @@
#endif #endif
#define NCR5380_dma_xfer_len(instance, cmd, phase) \ #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_intr generic_NCR5380_intr
#define NCR5380_queue_command generic_NCR5380_queue_command #define NCR5380_queue_command generic_NCR5380_queue_command

15
drivers/scsi/mac_scsi.c
View File

@ -37,7 +37,9 @@
#define NCR5380_pread macscsi_pread #define NCR5380_pread macscsi_pread
#define NCR5380_pwrite macscsi_pwrite #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_intr macscsi_intr
#define NCR5380_queue_command macscsi_queue_command #define NCR5380_queue_command macscsi_queue_command
@ -303,6 +305,17 @@ static int macscsi_pwrite(struct Scsi_Host *instance,
} }
#endif #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" #include "NCR5380.c"
#define DRV_MODULE_NAME "mac_scsi" #define DRV_MODULE_NAME "mac_scsi"