aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:46 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:46 -0400
commitffa15a6915b7f6f6f69b4a66e1100a9c68d11250 (patch)
tree7893654c44bc570d55c00a682c9725816bd5c285 /drivers/ide/ide-dma.c
parentde23ec9ca82357e6d337a2263befb1a65cf19c83 (diff)
ide: make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n
Make ide_dma_timeout() available also for CONFIG_BLK_DEV_IDEDMA_SFF=n and convert {ics,au1xxx-}ide.c to use it. While at it: - dump ATA Status register content on error - use EXPORT_SYMBOL_GPL() to match the rest of SFF DMA functions Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 08cd878de50b..244b61b573ce 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -829,8 +829,7 @@ void ide_dma_lost_irq(ide_drive_t *drive)
829} 829}
830EXPORT_SYMBOL_GPL(ide_dma_lost_irq); 830EXPORT_SYMBOL_GPL(ide_dma_lost_irq);
831 831
832#ifdef CONFIG_BLK_DEV_IDEDMA_SFF 832void ide_dma_timeout(ide_drive_t *drive)
833void ide_dma_timeout (ide_drive_t *drive)
834{ 833{
835 ide_hwif_t *hwif = HWIF(drive); 834 ide_hwif_t *hwif = HWIF(drive);
836 835
@@ -839,11 +838,13 @@ void ide_dma_timeout (ide_drive_t *drive)
839 if (hwif->dma_ops->dma_test_irq(drive)) 838 if (hwif->dma_ops->dma_test_irq(drive))
840 return; 839 return;
841 840
841 ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif));
842
842 hwif->dma_ops->dma_end(drive); 843 hwif->dma_ops->dma_end(drive);
843} 844}
845EXPORT_SYMBOL_GPL(ide_dma_timeout);
844 846
845EXPORT_SYMBOL(ide_dma_timeout); 847#ifdef CONFIG_BLK_DEV_IDEDMA_SFF
846
847void ide_release_dma_engine(ide_hwif_t *hwif) 848void ide_release_dma_engine(ide_hwif_t *hwif)
848{ 849{
849 if (hwif->dmatable_cpu) { 850 if (hwif->dmatable_cpu) {