Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35c9b4da authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e698ea83

drivers/ide/alim15x3.c

+0 −1
Original line number Diff line number Diff line
@@ -509,7 +509,6 @@ static const struct ide_dma_ops ali_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};

drivers/ide/au1xxx-ide.c

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ static const struct ide_dma_ops au1xxx_dma_ops = { 
	.dma_end		= auide_dma_end,

	.dma_test_irq		= auide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

};



static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d)

drivers/ide/cmd64x.c

+0 −3
Original line number Diff line number Diff line
@@ -384,7 +384,6 @@ static const struct ide_dma_ops cmd64x_dma_ops = { 
	.dma_test_irq		= cmd64x_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};
@@ -396,7 +395,6 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};
@@ -408,7 +406,6 @@ static const struct ide_dma_ops cmd648_dma_ops = { 
	.dma_test_irq		= cmd648_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};

drivers/ide/cs5536.c

+0 −1
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ static const struct ide_dma_ops cs5536_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

};



static const struct ide_port_info cs5536_info = {

drivers/ide/hpt366.c

+1 −9
Original line number Diff line number Diff line
@@ -835,12 +835,6 @@ static int hpt370_dma_end(ide_drive_t *drive) 
	return ide_dma_end(drive);

}



static void hpt370_dma_timeout(ide_drive_t *drive)

{

	hpt370_irq_timeout(drive);

	ide_dma_timeout(drive);

}



/* returns 1 if DMA IRQ issued, 0 otherwise */

static int hpt374_dma_test_irq(ide_drive_t *drive)

{
@@ -1423,7 +1417,6 @@ static const struct ide_dma_ops hpt37x_dma_ops = { 
	.dma_test_irq		= hpt374_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};
@@ -1435,7 +1428,7 @@ static const struct ide_dma_ops hpt370_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= hpt370_dma_timeout,

	.dma_clear		= hpt370_irq_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};
@@ -1447,7 +1440,6 @@ static const struct ide_dma_ops hpt36x_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= hpt366_dma_lost_irq,

	.dma_timer_expiry	= ide_dma_sff_timer_expiry,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};