diff options
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index cac14b22506f..d3d8b8d5157c 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -993,7 +993,7 @@ static ide_startstop_t idetape_pc_intr(ide_drive_t *drive) | |||
993 | stat = ide_read_status(drive); | 993 | stat = ide_read_status(drive); |
994 | 994 | ||
995 | if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) { | 995 | if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) { |
996 | if (hwif->ide_dma_end(drive) || (stat & ERR_STAT)) { | 996 | if (hwif->dma_ops->dma_end(drive) || (stat & ERR_STAT)) { |
997 | /* | 997 | /* |
998 | * A DMA error is sometimes expected. For example, | 998 | * A DMA error is sometimes expected. For example, |
999 | * if the tape is crossing a filemark during a | 999 | * if the tape is crossing a filemark during a |
@@ -1213,7 +1213,7 @@ static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive) | |||
1213 | #ifdef CONFIG_BLK_DEV_IDEDMA | 1213 | #ifdef CONFIG_BLK_DEV_IDEDMA |
1214 | /* Begin DMA, if necessary */ | 1214 | /* Begin DMA, if necessary */ |
1215 | if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) | 1215 | if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) |
1216 | hwif->dma_start(drive); | 1216 | hwif->dma_ops->dma_start(drive); |
1217 | #endif | 1217 | #endif |
1218 | /* Send the actual packet */ | 1218 | /* Send the actual packet */ |
1219 | HWIF(drive)->atapi_output_bytes(drive, pc->c, 12); | 1219 | HWIF(drive)->atapi_output_bytes(drive, pc->c, 12); |
@@ -1279,7 +1279,7 @@ static ide_startstop_t idetape_issue_pc(ide_drive_t *drive, | |||
1279 | ide_dma_off(drive); | 1279 | ide_dma_off(drive); |
1280 | } | 1280 | } |
1281 | if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma) | 1281 | if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma) |
1282 | dma_ok = !hwif->dma_setup(drive); | 1282 | dma_ok = !hwif->dma_ops->dma_setup(drive); |
1283 | 1283 | ||
1284 | ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK | | 1284 | ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK | |
1285 | IDE_TFLAG_OUT_DEVICE, bcount, dma_ok); | 1285 | IDE_TFLAG_OUT_DEVICE, bcount, dma_ok); |