diff options
Diffstat (limited to 'drivers/ide/hpt366.c')
-rw-r--r-- | drivers/ide/hpt366.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c index dbaf184ed9c5..a0eb87f59134 100644 --- a/drivers/ide/hpt366.c +++ b/drivers/ide/hpt366.c | |||
@@ -835,12 +835,6 @@ static int hpt370_dma_end(ide_drive_t *drive) | |||
835 | return ide_dma_end(drive); | 835 | return ide_dma_end(drive); |
836 | } | 836 | } |
837 | 837 | ||
838 | static void hpt370_dma_timeout(ide_drive_t *drive) | ||
839 | { | ||
840 | hpt370_irq_timeout(drive); | ||
841 | ide_dma_timeout(drive); | ||
842 | } | ||
843 | |||
844 | /* returns 1 if DMA IRQ issued, 0 otherwise */ | 838 | /* returns 1 if DMA IRQ issued, 0 otherwise */ |
845 | static int hpt374_dma_test_irq(ide_drive_t *drive) | 839 | static int hpt374_dma_test_irq(ide_drive_t *drive) |
846 | { | 840 | { |
@@ -1423,7 +1417,6 @@ static const struct ide_dma_ops hpt37x_dma_ops = { | |||
1423 | .dma_test_irq = hpt374_dma_test_irq, | 1417 | .dma_test_irq = hpt374_dma_test_irq, |
1424 | .dma_lost_irq = ide_dma_lost_irq, | 1418 | .dma_lost_irq = ide_dma_lost_irq, |
1425 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 1419 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
1426 | .dma_timeout = ide_dma_timeout, | ||
1427 | .dma_sff_read_status = ide_dma_sff_read_status, | 1420 | .dma_sff_read_status = ide_dma_sff_read_status, |
1428 | }; | 1421 | }; |
1429 | 1422 | ||
@@ -1435,7 +1428,7 @@ static const struct ide_dma_ops hpt370_dma_ops = { | |||
1435 | .dma_test_irq = ide_dma_test_irq, | 1428 | .dma_test_irq = ide_dma_test_irq, |
1436 | .dma_lost_irq = ide_dma_lost_irq, | 1429 | .dma_lost_irq = ide_dma_lost_irq, |
1437 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 1430 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
1438 | .dma_timeout = hpt370_dma_timeout, | 1431 | .dma_clear = hpt370_irq_timeout, |
1439 | .dma_sff_read_status = ide_dma_sff_read_status, | 1432 | .dma_sff_read_status = ide_dma_sff_read_status, |
1440 | }; | 1433 | }; |
1441 | 1434 | ||
@@ -1447,7 +1440,6 @@ static const struct ide_dma_ops hpt36x_dma_ops = { | |||
1447 | .dma_test_irq = ide_dma_test_irq, | 1440 | .dma_test_irq = ide_dma_test_irq, |
1448 | .dma_lost_irq = hpt366_dma_lost_irq, | 1441 | .dma_lost_irq = hpt366_dma_lost_irq, |
1449 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 1442 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
1450 | .dma_timeout = ide_dma_timeout, | ||
1451 | .dma_sff_read_status = ide_dma_sff_read_status, | 1443 | .dma_sff_read_status = ide_dma_sff_read_status, |
1452 | }; | 1444 | }; |
1453 | 1445 | ||