aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:43 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:43 -0400
commit65ca5377322c7543163066f373ae9e6b0ad8de8a (patch)
tree0d333cb6c781f151d82ed66fd4ece26359525366 /include
parentb6a45a0b1e9a358b81201659cf87b023e3ec73e0 (diff)
ide: move ide_dma_timeout_retry() to ide-dma.c
Move ide_dma_timeout_retry() to ide-dma.c and add static inline version for CONFIG_BLK_DEV_IDEDMA=n. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ide.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 2e95adeedff4..d0065a90452b 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1467,6 +1467,7 @@ static inline int config_drive_for_dma(ide_drive_t *drive) { return 0; }
1467 1467
1468void ide_dma_lost_irq(ide_drive_t *); 1468void ide_dma_lost_irq(ide_drive_t *);
1469void ide_dma_timeout(ide_drive_t *); 1469void ide_dma_timeout(ide_drive_t *);
1470ide_startstop_t ide_dma_timeout_retry(ide_drive_t *, int);
1470 1471
1471#else 1472#else
1472static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } 1473static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; }
@@ -1478,6 +1479,7 @@ static inline void ide_dma_on(ide_drive_t *drive) { ; }
1478static inline void ide_dma_verbose(ide_drive_t *drive) { ; } 1479static inline void ide_dma_verbose(ide_drive_t *drive) { ; }
1479static inline int ide_set_dma(ide_drive_t *drive) { return 1; } 1480static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
1480static inline void ide_check_dma_crc(ide_drive_t *drive) { ; } 1481static inline void ide_check_dma_crc(ide_drive_t *drive) { ; }
1482static inline ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) { return ide_stopped; }
1481static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; } 1483static inline void ide_release_dma_engine(ide_hwif_t *hwif) { ; }
1482#endif /* CONFIG_BLK_DEV_IDEDMA */ 1484#endif /* CONFIG_BLK_DEV_IDEDMA */
1483 1485