diff options
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index d3185e29a38e..53bee59264ef 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -316,14 +316,6 @@ static void sgiioc4_dma_host_off(ide_drive_t * drive) | |||
316 | sgiioc4_clearirq(drive); | 316 | sgiioc4_clearirq(drive); |
317 | } | 317 | } |
318 | 318 | ||
319 | static int | ||
320 | sgiioc4_ide_dma_lostirq(ide_drive_t * drive) | ||
321 | { | ||
322 | HWIF(drive)->resetproc(drive); | ||
323 | |||
324 | return __ide_dma_lostirq(drive); | ||
325 | } | ||
326 | |||
327 | static void | 319 | static void |
328 | sgiioc4_resetproc(ide_drive_t * drive) | 320 | sgiioc4_resetproc(ide_drive_t * drive) |
329 | { | 321 | { |
@@ -331,6 +323,14 @@ sgiioc4_resetproc(ide_drive_t * drive) | |||
331 | sgiioc4_clearirq(drive); | 323 | sgiioc4_clearirq(drive); |
332 | } | 324 | } |
333 | 325 | ||
326 | static void | ||
327 | sgiioc4_dma_lost_irq(ide_drive_t * drive) | ||
328 | { | ||
329 | sgiioc4_resetproc(drive); | ||
330 | |||
331 | ide_dma_lost_irq(drive); | ||
332 | } | ||
333 | |||
334 | static u8 | 334 | static u8 |
335 | sgiioc4_INB(unsigned long port) | 335 | sgiioc4_INB(unsigned long port) |
336 | { | 336 | { |
@@ -607,7 +607,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif) | |||
607 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; | 607 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; |
608 | hwif->dma_host_on = &sgiioc4_dma_host_on; | 608 | hwif->dma_host_on = &sgiioc4_dma_host_on; |
609 | hwif->dma_host_off = &sgiioc4_dma_host_off; | 609 | hwif->dma_host_off = &sgiioc4_dma_host_off; |
610 | hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq; | 610 | hwif->dma_lost_irq = &sgiioc4_dma_lost_irq; |
611 | hwif->ide_dma_timeout = &__ide_dma_timeout; | 611 | hwif->ide_dma_timeout = &__ide_dma_timeout; |
612 | 612 | ||
613 | hwif->INB = &sgiioc4_INB; | 613 | hwif->INB = &sgiioc4_INB; |