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

Commit 22117d6e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add ->dma_timer_expiry method and remove ->dma_exec_cmd one (v2) 



* Rename dma_timer_expiry() to ide_dma_sff_timer_expiry() and export it.

* Add ->dma_timer_expiry method and use it to set hwif->expiry for
  ATA_PROT_DMA protocol in do_rw_taskfile().

* Initialize ->dma_timer_expiry to ide_dma_sff_timer_expiry() for SFF hosts.

* Move setting hwif->expiry from ide_execute_command() to its users and drop
  'expiry' argument.

* Use ide_execute_command() instead of ->dma_exec_cmd in do_rw_taskfile().

* Remove ->dma_exec_cmd method and its implementations.

* Unexport ide_execute_command() and ide_dma_intr().

v2:
* Fix CONFIG_BLK_DEV_IDEDMA=n build (noticed by Randy Dunlap).

* Fix *dma_expiry naming (suggested by Sergei Shtylyov).

There should be no functional changes caused by this patch.

Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 60c0cd02

drivers/ide/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -504,11 +504,11 @@ static const struct ide_port_ops ali_port_ops = { 
static const struct ide_dma_ops ali_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ali15x3_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= ide_dma_end,

	.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 −8
Original line number Diff line number Diff line
@@ -290,13 +290,6 @@ static void auide_dma_start(ide_drive_t *drive ) 
}





static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command)

{

	/* issue cmd to drive */

	ide_execute_command(drive, command, &ide_dma_intr,

			    (2*WAIT_CMD), NULL);

}



static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)

{

	if (auide_build_dmatable(drive, cmd) == 0) {
@@ -356,7 +349,6 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de 
static const struct ide_dma_ops au1xxx_dma_ops = {

	.dma_host_set		= auide_dma_host_set,

	.dma_setup		= auide_dma_setup,

	.dma_exec_cmd		= auide_dma_exec_cmd,

	.dma_start		= auide_dma_start,

	.dma_end		= auide_dma_end,

	.dma_test_irq		= auide_dma_test_irq,

drivers/ide/cmd64x.c

+3 −3
Original line number Diff line number Diff line
@@ -379,11 +379,11 @@ static const struct ide_port_ops cmd64x_port_ops = { 
static const struct ide_dma_ops cmd64x_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= cmd64x_dma_end,

	.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,

};
@@ -391,11 +391,11 @@ static const struct ide_dma_ops cmd64x_dma_ops = { 
static const struct ide_dma_ops cmd646_rev1_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= cmd646_1_dma_end,

	.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,

};
@@ -403,11 +403,11 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = { 
static const struct ide_dma_ops cmd648_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= cmd648_dma_end,

	.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

+1 −1
Original line number Diff line number Diff line
@@ -231,11 +231,11 @@ static const struct ide_port_ops cs5536_port_ops = { 
static const struct ide_dma_ops cs5536_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= cs5536_dma_start,

	.dma_end		= cs5536_dma_end,

	.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,

};

drivers/ide/hpt366.c

+3 −3
Original line number Diff line number Diff line
@@ -1418,11 +1418,11 @@ static const struct ide_port_ops hpt3xx_port_ops = { 
static const struct ide_dma_ops hpt37x_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= hpt374_dma_end,

	.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,

};
@@ -1430,11 +1430,11 @@ static const struct ide_dma_ops hpt37x_dma_ops = { 
static const struct ide_dma_ops hpt370_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= hpt370_dma_start,

	.dma_end		= hpt370_dma_end,

	.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_sff_read_status	= ide_dma_sff_read_status,

};
@@ -1442,11 +1442,11 @@ static const struct ide_dma_ops hpt370_dma_ops = { 
static const struct ide_dma_ops hpt36x_dma_ops = {

	.dma_host_set		= ide_dma_host_set,

	.dma_setup		= ide_dma_setup,

	.dma_exec_cmd		= ide_dma_exec_cmd,

	.dma_start		= ide_dma_start,

	.dma_end		= ide_dma_end,

	.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,

};