diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index bf106d569cfc..140864d63aed 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -546,8 +546,6 @@ typedef struct hwif_s { | |||
546 | void (*dma_exec_cmd)(ide_drive_t *, u8); | 546 | void (*dma_exec_cmd)(ide_drive_t *, u8); |
547 | void (*dma_start)(ide_drive_t *); | 547 | void (*dma_start)(ide_drive_t *); |
548 | int (*ide_dma_end)(ide_drive_t *drive); | 548 | int (*ide_dma_end)(ide_drive_t *drive); |
549 | int (*ide_dma_on)(ide_drive_t *drive); | ||
550 | void (*dma_off_quietly)(ide_drive_t *drive); | ||
551 | int (*ide_dma_test_irq)(ide_drive_t *drive); | 549 | int (*ide_dma_test_irq)(ide_drive_t *drive); |
552 | void (*ide_dma_clear_irq)(ide_drive_t *drive); | 550 | void (*ide_dma_clear_irq)(ide_drive_t *drive); |
553 | void (*dma_host_on)(ide_drive_t *drive); | 551 | void (*dma_host_on)(ide_drive_t *drive); |
@@ -1149,7 +1147,9 @@ static inline u8 ide_max_dma_mode(ide_drive_t *drive) | |||
1149 | return ide_find_dma_mode(drive, XFER_UDMA_6); | 1147 | return ide_find_dma_mode(drive, XFER_UDMA_6); |
1150 | } | 1148 | } |
1151 | 1149 | ||
1150 | void ide_dma_off_quietly(ide_drive_t *); | ||
1152 | void ide_dma_off(ide_drive_t *); | 1151 | void ide_dma_off(ide_drive_t *); |
1152 | void ide_dma_on(ide_drive_t *); | ||
1153 | int ide_set_dma(ide_drive_t *); | 1153 | int ide_set_dma(ide_drive_t *); |
1154 | ide_startstop_t ide_dma_intr(ide_drive_t *); | 1154 | ide_startstop_t ide_dma_intr(ide_drive_t *); |
1155 | 1155 | ||
@@ -1161,9 +1161,7 @@ extern int ide_release_dma(ide_hwif_t *); | |||
1161 | extern void ide_setup_dma(ide_hwif_t *, unsigned long, unsigned int); | 1161 | extern void ide_setup_dma(ide_hwif_t *, unsigned long, unsigned int); |
1162 | 1162 | ||
1163 | void ide_dma_host_off(ide_drive_t *); | 1163 | void ide_dma_host_off(ide_drive_t *); |
1164 | void ide_dma_off_quietly(ide_drive_t *); | ||
1165 | void ide_dma_host_on(ide_drive_t *); | 1164 | void ide_dma_host_on(ide_drive_t *); |
1166 | extern int __ide_dma_on(ide_drive_t *); | ||
1167 | extern int ide_dma_setup(ide_drive_t *); | 1165 | extern int ide_dma_setup(ide_drive_t *); |
1168 | extern void ide_dma_start(ide_drive_t *); | 1166 | extern void ide_dma_start(ide_drive_t *); |
1169 | extern int __ide_dma_end(ide_drive_t *); | 1167 | extern int __ide_dma_end(ide_drive_t *); |
@@ -1175,7 +1173,9 @@ extern void ide_dma_timeout(ide_drive_t *); | |||
1175 | static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } | 1173 | static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } |
1176 | static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; } | 1174 | static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; } |
1177 | static inline u8 ide_max_dma_mode(ide_drive_t *drive) { return 0; } | 1175 | static inline u8 ide_max_dma_mode(ide_drive_t *drive) { return 0; } |
1176 | static inline void ide_dma_off_quietly(ide_drive_t *drive) { ; } | ||
1178 | static inline void ide_dma_off(ide_drive_t *drive) { ; } | 1177 | static inline void ide_dma_off(ide_drive_t *drive) { ; } |
1178 | static inline void ide_dma_on(ide_drive_t *drive) { ; } | ||
1179 | static inline void ide_dma_verbose(ide_drive_t *drive) { ; } | 1179 | static inline void ide_dma_verbose(ide_drive_t *drive) { ; } |
1180 | static inline int ide_set_dma(ide_drive_t *drive) { return 1; } | 1180 | static inline int ide_set_dma(ide_drive_t *drive) { return 1; } |
1181 | #endif /* CONFIG_BLK_DEV_IDEDMA */ | 1181 | #endif /* CONFIG_BLK_DEV_IDEDMA */ |