[PATCH] pdc202xx_old: fix 'pdc20246_dma_ops'

[PATCH] pdc202xx_old: fix 'pdc20246_dma_ops'

[Sergei Shtylyov]

Commit ac95beedf8bc97b24f9540d4da9952f07221c023 (ide: add struct ide_port_ops
(take 2)) erroneously converted the driver's dma_timeout() and dma_lost_irq()
methods to call the driver's resetproc() method regardless of whether it was
defined for this specific controller while it hadn't been defined and hence
called for PDC20246. So the dma_clear() method, the successor of dma_timeout(),
shouldn't exist and the dma_lost_irq() method should be standard for PDC20246.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

---
The patch is against the ide-2.6.git 'master' branch...

 drivers/ide/pdc202xx_old.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

Index: ide-2.6/drivers/ide/pdc202xx_old.c
===================================================================
--- ide-2.6.orig/drivers/ide/pdc202xx_old.c
+++ ide-2.6/drivers/ide/pdc202xx_old.c
@@ -319,9 +319,8 @@ static const struct ide_dma_ops pdc20246
 	.dma_start		= ide_dma_start,
 	.dma_end		= ide_dma_end,
 	.dma_test_irq		= pdc202xx_dma_test_irq,
-	.dma_lost_irq		= pdc202xx_dma_lost_irq,
+	.dma_lost_irq		= ide_dma_lost_irq,
 	.dma_timer_expiry	= ide_dma_sff_timer_expiry,
-	.dma_clear		= pdc202xx_reset,
 	.dma_sff_read_status	= ide_dma_sff_read_status,
 };
 

Re: [PATCH] pdc202xx_old: fix 'pdc20246_dma_ops'

[Bartlomiej Zolnierkiewicz]

On Wednesday 03 June 2009 20:34:44 Sergei Shtylyov wrote:
> Commit ac95beedf8bc97b24f9540d4da9952f07221c023 (ide: add struct ide_port_ops
> (take 2)) erroneously converted the driver's dma_timeout() and dma_lost_irq()
> methods to call the driver's resetproc() method regardless of whether it was
> defined for this specific controller while it hadn't been defined and hence
> called for PDC20246. So the dma_clear() method, the successor of dma_timeout(),
> shouldn't exist and the dma_lost_irq() method should be standard for PDC20246.
> 
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

applied, thanks!