diff options
Diffstat (limited to 'drivers/scsi/ide-scsi.c')
-rw-r--r-- | drivers/scsi/ide-scsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c index 93c3fc20aa59..3638fa808ded 100644 --- a/drivers/scsi/ide-scsi.c +++ b/drivers/scsi/ide-scsi.c | |||
@@ -393,7 +393,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive) | |||
393 | printk ("ide-scsi: %s: DMA complete\n", drive->name); | 393 | printk ("ide-scsi: %s: DMA complete\n", drive->name); |
394 | #endif /* IDESCSI_DEBUG_LOG */ | 394 | #endif /* IDESCSI_DEBUG_LOG */ |
395 | pc->xferred = pc->req_xfer; | 395 | pc->xferred = pc->req_xfer; |
396 | (void) HWIF(drive)->ide_dma_end(drive); | 396 | (void)hwif->dma_ops->dma_end(drive); |
397 | } | 397 | } |
398 | 398 | ||
399 | /* Clear the interrupt */ | 399 | /* Clear the interrupt */ |
@@ -498,7 +498,7 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive) | |||
498 | drive->hwif->atapi_output_bytes(drive, scsi->pc->c, 12); | 498 | drive->hwif->atapi_output_bytes(drive, scsi->pc->c, 12); |
499 | if (pc->flags & PC_FLAG_DMA_OK) { | 499 | if (pc->flags & PC_FLAG_DMA_OK) { |
500 | pc->flags |= PC_FLAG_DMA_IN_PROGRESS; | 500 | pc->flags |= PC_FLAG_DMA_IN_PROGRESS; |
501 | hwif->dma_start(drive); | 501 | hwif->dma_ops->dma_start(drive); |
502 | } | 502 | } |
503 | return ide_started; | 503 | return ide_started; |
504 | } | 504 | } |
@@ -560,7 +560,7 @@ static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive, | |||
560 | 560 | ||
561 | if (drive->using_dma && !idescsi_map_sg(drive, pc)) { | 561 | if (drive->using_dma && !idescsi_map_sg(drive, pc)) { |
562 | hwif->sg_mapped = 1; | 562 | hwif->sg_mapped = 1; |
563 | dma = !hwif->dma_setup(drive); | 563 | dma = !hwif->dma_ops->dma_setup(drive); |
564 | hwif->sg_mapped = 0; | 564 | hwif->sg_mapped = 0; |
565 | } | 565 | } |
566 | 566 | ||