aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index e72112efab9a..be99d463dcc7 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -104,7 +104,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive)
104 u8 stat = 0, dma_stat = 0; 104 u8 stat = 0, dma_stat = 0;
105 105
106 dma_stat = hwif->dma_ops->dma_end(drive); 106 dma_stat = hwif->dma_ops->dma_end(drive);
107 stat = hwif->read_status(hwif); 107 stat = hwif->tp_ops->read_status(hwif);
108 108
109 if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) { 109 if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {
110 if (!dma_stat) { 110 if (!dma_stat) {
@@ -335,7 +335,7 @@ static int config_drive_for_dma (ide_drive_t *drive)
335static int dma_timer_expiry (ide_drive_t *drive) 335static int dma_timer_expiry (ide_drive_t *drive)
336{ 336{
337 ide_hwif_t *hwif = HWIF(drive); 337 ide_hwif_t *hwif = HWIF(drive);
338 u8 dma_stat = hwif->read_sff_dma_status(hwif); 338 u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
339 339
340 printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n", 340 printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",
341 drive->name, dma_stat); 341 drive->name, dma_stat);
@@ -370,7 +370,7 @@ void ide_dma_host_set(ide_drive_t *drive, int on)
370{ 370{
371 ide_hwif_t *hwif = HWIF(drive); 371 ide_hwif_t *hwif = HWIF(drive);
372 u8 unit = (drive->select.b.unit & 0x01); 372 u8 unit = (drive->select.b.unit & 0x01);
373 u8 dma_stat = hwif->read_sff_dma_status(hwif); 373 u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
374 374
375 if (on) 375 if (on)
376 dma_stat |= (1 << (5 + unit)); 376 dma_stat |= (1 << (5 + unit));
@@ -482,7 +482,7 @@ int ide_dma_setup(ide_drive_t *drive)
482 outb(reading, hwif->dma_base + ATA_DMA_CMD); 482 outb(reading, hwif->dma_base + ATA_DMA_CMD);
483 483
484 /* read DMA status for INTR & ERROR flags */ 484 /* read DMA status for INTR & ERROR flags */
485 dma_stat = hwif->read_sff_dma_status(hwif); 485 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
486 486
487 /* clear INTR & ERROR flags */ 487 /* clear INTR & ERROR flags */
488 if (mmio) 488 if (mmio)
@@ -551,7 +551,7 @@ int __ide_dma_end (ide_drive_t *drive)
551 } 551 }
552 552
553 /* get DMA status */ 553 /* get DMA status */
554 dma_stat = hwif->read_sff_dma_status(hwif); 554 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
555 555
556 if (mmio) 556 if (mmio)
557 /* clear the INTR & ERROR bits */ 557 /* clear the INTR & ERROR bits */
@@ -574,7 +574,7 @@ EXPORT_SYMBOL(__ide_dma_end);
574int ide_dma_test_irq(ide_drive_t *drive) 574int ide_dma_test_irq(ide_drive_t *drive)
575{ 575{
576 ide_hwif_t *hwif = HWIF(drive); 576 ide_hwif_t *hwif = HWIF(drive);
577 u8 dma_stat = hwif->read_sff_dma_status(hwif); 577 u8 dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);
578 578
579 /* return 1 if INTR asserted */ 579 /* return 1 if INTR asserted */
580 if ((dma_stat & 4) == 4) 580 if ((dma_stat & 4) == 4)