diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:19 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:19 -0400 |
commit | 35c9b4daf4c94b30e5cede597d98016ebf31b5ad (patch) | |
tree | 3248b5b3602218537ce0bce420fbde27a07b526b /drivers/ide/scc_pata.c | |
parent | e698ea83a8531a6740dc657329dcf0728392d6ac (diff) |
ide: add ->dma_clear method and remove ->dma_timeout one
All custom ->dma_timeout implementations call the generic one thus it is
possible to have only an optional method for resetting DMA engine instead:
* Add ->dma_clear method and convert hpt366, pdc202xx_old and sl82c105
host drivers to use it.
* Always use ide_dma_timeout() in ide_dma_timeout_retry() and remove
->dma_timeout method.
* Make ide_dma_timeout() static.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/scc_pata.c')
-rw-r--r-- | drivers/ide/scc_pata.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 0cc137cfe76d..64534d150b0c 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -872,7 +872,6 @@ static const struct ide_dma_ops scc_dma_ops = { | |||
872 | .dma_end = scc_dma_end, | 872 | .dma_end = scc_dma_end, |
873 | .dma_test_irq = scc_dma_test_irq, | 873 | .dma_test_irq = scc_dma_test_irq, |
874 | .dma_lost_irq = ide_dma_lost_irq, | 874 | .dma_lost_irq = ide_dma_lost_irq, |
875 | .dma_timeout = ide_dma_timeout, | ||
876 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 875 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
877 | .dma_sff_read_status = scc_dma_sff_read_status, | 876 | .dma_sff_read_status = scc_dma_sff_read_status, |
878 | }; | 877 | }; |