diff options
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index fcd33f17d8fe..ad984322da94 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -539,7 +539,7 @@ static ide_startstop_t cdrom_start_packet_command(ide_drive_t *drive, | |||
539 | 539 | ||
540 | /* FIXME: for Virtual DMA we must check harder */ | 540 | /* FIXME: for Virtual DMA we must check harder */ |
541 | if (info->dma) | 541 | if (info->dma) |
542 | info->dma = !hwif->dma_setup(drive); | 542 | info->dma = !hwif->dma_ops->dma_setup(drive); |
543 | 543 | ||
544 | /* set up the controller registers */ | 544 | /* set up the controller registers */ |
545 | ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL | | 545 | ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL | |
@@ -617,7 +617,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive, | |||
617 | 617 | ||
618 | /* start the DMA if need be */ | 618 | /* start the DMA if need be */ |
619 | if (info->dma) | 619 | if (info->dma) |
620 | hwif->dma_start(drive); | 620 | hwif->dma_ops->dma_start(drive); |
621 | 621 | ||
622 | return ide_started; | 622 | return ide_started; |
623 | } | 623 | } |
@@ -929,7 +929,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) | |||
929 | dma = info->dma; | 929 | dma = info->dma; |
930 | if (dma) { | 930 | if (dma) { |
931 | info->dma = 0; | 931 | info->dma = 0; |
932 | dma_error = HWIF(drive)->ide_dma_end(drive); | 932 | dma_error = hwif->dma_ops->dma_end(drive); |
933 | if (dma_error) { | 933 | if (dma_error) { |
934 | printk(KERN_ERR "%s: DMA %s error\n", drive->name, | 934 | printk(KERN_ERR "%s: DMA %s error\n", drive->name, |
935 | write ? "write" : "read"); | 935 | write ? "write" : "read"); |