diff options
| -rw-r--r-- | drivers/ide/arm/icside.c | 7 | ||||
| -rw-r--r-- | drivers/ide/ide-dma.c | 9 | ||||
| -rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 7 | ||||
| -rw-r--r-- | include/linux/ide.h | 3 |
4 files changed, 8 insertions, 18 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 70f5b164828b..40ebe04f3995 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
| @@ -386,11 +386,6 @@ static void icside_dma_timeout(ide_drive_t *drive) | |||
| 386 | icside_dma_end(drive); | 386 | icside_dma_end(drive); |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | static void icside_dma_lost_irq(ide_drive_t *drive) | ||
| 390 | { | ||
| 391 | printk(KERN_ERR "%s: IRQ lost\n", drive->name); | ||
| 392 | } | ||
| 393 | |||
| 394 | static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d) | 389 | static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d) |
| 395 | { | 390 | { |
| 396 | hwif->dmatable_cpu = NULL; | 391 | hwif->dmatable_cpu = NULL; |
| @@ -407,7 +402,7 @@ static const struct ide_dma_ops icside_v6_dma_ops = { | |||
| 407 | .dma_end = icside_dma_end, | 402 | .dma_end = icside_dma_end, |
| 408 | .dma_test_irq = icside_dma_test_irq, | 403 | .dma_test_irq = icside_dma_test_irq, |
| 409 | .dma_timeout = icside_dma_timeout, | 404 | .dma_timeout = icside_dma_timeout, |
| 410 | .dma_lost_irq = icside_dma_lost_irq, | 405 | .dma_lost_irq = ide_dma_lost_irq, |
| 411 | }; | 406 | }; |
| 412 | #else | 407 | #else |
| 413 | #define icside_v6_dma_ops NULL | 408 | #define icside_v6_dma_ops NULL |
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index f142d8f1349e..08cd878de50b 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -823,14 +823,13 @@ void ide_check_dma_crc(ide_drive_t *drive) | |||
| 823 | ide_dma_on(drive); | 823 | ide_dma_on(drive); |
| 824 | } | 824 | } |
| 825 | 825 | ||
| 826 | #ifdef CONFIG_BLK_DEV_IDEDMA_SFF | 826 | void ide_dma_lost_irq(ide_drive_t *drive) |
| 827 | void ide_dma_lost_irq (ide_drive_t *drive) | ||
| 828 | { | 827 | { |
| 829 | printk("%s: DMA interrupt recovery\n", drive->name); | 828 | printk(KERN_ERR "%s: DMA interrupt recovery\n", drive->name); |
| 830 | } | 829 | } |
| 830 | EXPORT_SYMBOL_GPL(ide_dma_lost_irq); | ||
| 831 | 831 | ||
| 832 | EXPORT_SYMBOL(ide_dma_lost_irq); | 832 | #ifdef CONFIG_BLK_DEV_IDEDMA_SFF |
| 833 | |||
| 834 | void ide_dma_timeout (ide_drive_t *drive) | 833 | void ide_dma_timeout (ide_drive_t *drive) |
| 835 | { | 834 | { |
| 836 | ide_hwif_t *hwif = HWIF(drive); | 835 | ide_hwif_t *hwif = HWIF(drive); |
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 1c95a0ed7504..92c90db4bb30 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
| @@ -340,11 +340,6 @@ static void auide_dma_host_set(ide_drive_t *drive, int on) | |||
| 340 | { | 340 | { |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | static void auide_dma_lost_irq(ide_drive_t *drive) | ||
| 344 | { | ||
| 345 | printk(KERN_ERR "%s: IRQ lost\n", drive->name); | ||
| 346 | } | ||
| 347 | |||
| 348 | static void auide_ddma_tx_callback(int irq, void *param) | 343 | static void auide_ddma_tx_callback(int irq, void *param) |
| 349 | { | 344 | { |
| 350 | _auide_hwif *ahwif = (_auide_hwif*)param; | 345 | _auide_hwif *ahwif = (_auide_hwif*)param; |
| @@ -390,7 +385,7 @@ static const struct ide_dma_ops au1xxx_dma_ops = { | |||
| 390 | .dma_start = auide_dma_start, | 385 | .dma_start = auide_dma_start, |
| 391 | .dma_end = auide_dma_end, | 386 | .dma_end = auide_dma_end, |
| 392 | .dma_test_irq = auide_dma_test_irq, | 387 | .dma_test_irq = auide_dma_test_irq, |
| 393 | .dma_lost_irq = auide_dma_lost_irq, | 388 | .dma_lost_irq = ide_dma_lost_irq, |
| 394 | .dma_timeout = auide_dma_timeout, | 389 | .dma_timeout = auide_dma_timeout, |
| 395 | }; | 390 | }; |
| 396 | 391 | ||
diff --git a/include/linux/ide.h b/include/linux/ide.h index 22f7451f7b49..ae4a25d2b066 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -1437,11 +1437,12 @@ void ide_dma_exec_cmd(ide_drive_t *, u8); | |||
| 1437 | extern void ide_dma_start(ide_drive_t *); | 1437 | extern void ide_dma_start(ide_drive_t *); |
| 1438 | int ide_dma_end(ide_drive_t *); | 1438 | int ide_dma_end(ide_drive_t *); |
| 1439 | int ide_dma_test_irq(ide_drive_t *); | 1439 | int ide_dma_test_irq(ide_drive_t *); |
| 1440 | extern void ide_dma_lost_irq(ide_drive_t *); | ||
| 1441 | extern void ide_dma_timeout(ide_drive_t *); | 1440 | extern void ide_dma_timeout(ide_drive_t *); |
| 1442 | extern const struct ide_dma_ops sff_dma_ops; | 1441 | extern const struct ide_dma_ops sff_dma_ops; |
| 1443 | #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ | 1442 | #endif /* CONFIG_BLK_DEV_IDEDMA_SFF */ |
| 1444 | 1443 | ||
| 1444 | void ide_dma_lost_irq(ide_drive_t *); | ||
| 1445 | |||
| 1445 | #else | 1446 | #else |
| 1446 | static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } | 1447 | static inline int ide_id_dma_bug(ide_drive_t *drive) { return 0; } |
| 1447 | static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; } | 1448 | static inline u8 ide_find_dma_mode(ide_drive_t *drive, u8 speed) { return 0; } |
