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.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index d5934fc8f85f..f142d8f1349e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -531,7 +531,7 @@ void ide_dma_start(ide_drive_t *drive)
531EXPORT_SYMBOL_GPL(ide_dma_start); 531EXPORT_SYMBOL_GPL(ide_dma_start);
532 532
533/* returns 1 on error, 0 otherwise */ 533/* returns 1 on error, 0 otherwise */
534int __ide_dma_end (ide_drive_t *drive) 534int ide_dma_end(ide_drive_t *drive)
535{ 535{
536 ide_hwif_t *hwif = drive->hwif; 536 ide_hwif_t *hwif = drive->hwif;
537 u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; 537 u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
@@ -566,8 +566,7 @@ int __ide_dma_end (ide_drive_t *drive)
566 wmb(); 566 wmb();
567 return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0; 567 return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;
568} 568}
569 569EXPORT_SYMBOL_GPL(ide_dma_end);
570EXPORT_SYMBOL(__ide_dma_end);
571 570
572/* returns 1 if dma irq issued, 0 otherwise */ 571/* returns 1 if dma irq issued, 0 otherwise */
573int ide_dma_test_irq(ide_drive_t *drive) 572int ide_dma_test_irq(ide_drive_t *drive)
@@ -880,7 +879,7 @@ const struct ide_dma_ops sff_dma_ops = {
880 .dma_setup = ide_dma_setup, 879 .dma_setup = ide_dma_setup,
881 .dma_exec_cmd = ide_dma_exec_cmd, 880 .dma_exec_cmd = ide_dma_exec_cmd,
882 .dma_start = ide_dma_start, 881 .dma_start = ide_dma_start,
883 .dma_end = __ide_dma_end, 882 .dma_end = ide_dma_end,
884 .dma_test_irq = ide_dma_test_irq, 883 .dma_test_irq = ide_dma_test_irq,
885 .dma_timeout = ide_dma_timeout, 884 .dma_timeout = ide_dma_timeout,
886 .dma_lost_irq = ide_dma_lost_irq, 885 .dma_lost_irq = ide_dma_lost_irq,