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/cmd64x.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/cmd64x.c')
-rw-r--r-- | drivers/ide/cmd64x.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index bf0e3f470824..f0a49d2ff711 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c | |||
@@ -384,7 +384,6 @@ static const struct ide_dma_ops cmd64x_dma_ops = { | |||
384 | .dma_test_irq = cmd64x_dma_test_irq, | 384 | .dma_test_irq = cmd64x_dma_test_irq, |
385 | .dma_lost_irq = ide_dma_lost_irq, | 385 | .dma_lost_irq = ide_dma_lost_irq, |
386 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 386 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
387 | .dma_timeout = ide_dma_timeout, | ||
388 | .dma_sff_read_status = ide_dma_sff_read_status, | 387 | .dma_sff_read_status = ide_dma_sff_read_status, |
389 | }; | 388 | }; |
390 | 389 | ||
@@ -396,7 +395,6 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { | |||
396 | .dma_test_irq = ide_dma_test_irq, | 395 | .dma_test_irq = ide_dma_test_irq, |
397 | .dma_lost_irq = ide_dma_lost_irq, | 396 | .dma_lost_irq = ide_dma_lost_irq, |
398 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 397 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
399 | .dma_timeout = ide_dma_timeout, | ||
400 | .dma_sff_read_status = ide_dma_sff_read_status, | 398 | .dma_sff_read_status = ide_dma_sff_read_status, |
401 | }; | 399 | }; |
402 | 400 | ||
@@ -408,7 +406,6 @@ static const struct ide_dma_ops cmd648_dma_ops = { | |||
408 | .dma_test_irq = cmd648_dma_test_irq, | 406 | .dma_test_irq = cmd648_dma_test_irq, |
409 | .dma_lost_irq = ide_dma_lost_irq, | 407 | .dma_lost_irq = ide_dma_lost_irq, |
410 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 408 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
411 | .dma_timeout = ide_dma_timeout, | ||
412 | .dma_sff_read_status = ide_dma_sff_read_status, | 409 | .dma_sff_read_status = ide_dma_sff_read_status, |
413 | }; | 410 | }; |
414 | 411 | ||