diff options
Diffstat (limited to 'drivers/ide/arm/icside.c')
| -rw-r--r-- | drivers/ide/arm/icside.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 40ebe04f3995..76bdc9a27f6f 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
| @@ -372,20 +372,6 @@ static int icside_dma_test_irq(ide_drive_t *drive) | |||
| 372 | ICS_ARCIN_V6_INTRSTAT_1)) & 1; | 372 | ICS_ARCIN_V6_INTRSTAT_1)) & 1; |
| 373 | } | 373 | } |
| 374 | 374 | ||
| 375 | static void icside_dma_timeout(ide_drive_t *drive) | ||
| 376 | { | ||
| 377 | ide_hwif_t *hwif = drive->hwif; | ||
| 378 | |||
| 379 | printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name); | ||
| 380 | |||
| 381 | if (icside_dma_test_irq(drive)) | ||
| 382 | return; | ||
| 383 | |||
| 384 | ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif)); | ||
| 385 | |||
| 386 | icside_dma_end(drive); | ||
| 387 | } | ||
| 388 | |||
| 389 | static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d) | 375 | static int icside_dma_init(ide_hwif_t *hwif, const struct ide_port_info *d) |
| 390 | { | 376 | { |
| 391 | hwif->dmatable_cpu = NULL; | 377 | hwif->dmatable_cpu = NULL; |
| @@ -401,7 +387,7 @@ static const struct ide_dma_ops icside_v6_dma_ops = { | |||
| 401 | .dma_start = icside_dma_start, | 387 | .dma_start = icside_dma_start, |
| 402 | .dma_end = icside_dma_end, | 388 | .dma_end = icside_dma_end, |
| 403 | .dma_test_irq = icside_dma_test_irq, | 389 | .dma_test_irq = icside_dma_test_irq, |
| 404 | .dma_timeout = icside_dma_timeout, | 390 | .dma_timeout = ide_dma_timeout, |
| 405 | .dma_lost_irq = ide_dma_lost_irq, | 391 | .dma_lost_irq = ide_dma_lost_irq, |
| 406 | }; | 392 | }; |
| 407 | #else | 393 | #else |
