mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-29 23:24:11 +08:00
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:
parent
9d376402c8
commit
7e9ec8d9cc
@ -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) {
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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.
|
||||
*/
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user