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

Commit ecf3a31d authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: turn set_irq() method into write_devctl() method 



Turn set_irq() method with its software reset hack into write_devctl() method
(for just writing a value into the device control register) at last...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 4d74c3fc

drivers/ide/at91_ide.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static const struct ide_tp_ops at91_ide_tp_ops = { 
	.exec_command	= ide_exec_command,

	.read_status	= ide_read_status,

	.read_altstatus	= ide_read_altstatus,

	.set_irq	= ide_set_irq,

	.write_devctl	= ide_write_devctl,



	.tf_load	= at91_ide_tf_load,

	.tf_read	= at91_ide_tf_read,

drivers/ide/au1xxx-ide.c

+1 −2
Original line number Diff line number Diff line
@@ -467,8 +467,7 @@ static const struct ide_tp_ops au1xxx_tp_ops = { 
	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,



	.set_irq		= ide_set_irq,

	.write_devctl		= ide_write_devctl,



	.tf_load		= ide_tf_load,

	.tf_read		= ide_tf_read,

drivers/ide/falconide.c

+1 −2
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ static const struct ide_tp_ops falconide_tp_ops = { 
	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,



	.set_irq		= ide_set_irq,

	.write_devctl		= ide_write_devctl,



	.tf_load		= ide_tf_load,

	.tf_read		= ide_tf_read,

drivers/ide/ide-eh.c

+3 −4
Original line number Diff line number Diff line
@@ -401,15 +401,14 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi) 
	 * immediate interrupt due to the edge transition it produces.

	 * This single interrupt gives us a "fast poll" for drives that

	 * recover from reset very quickly, saving us the first 50ms wait time.

	 *

	 * TODO: add ->softreset method and stop abusing ->set_irq

	 */

	/* set SRST and nIEN */

	tp_ops->set_irq(hwif, 4);

	tp_ops->write_devctl(hwif, ATA_SRST | ATA_NIEN | ATA_DEVCTL_OBS);

	/* more than enough time */

	udelay(10);

	/* clear SRST, leave nIEN (unless device is on the quirk list) */

	tp_ops->set_irq(hwif, drive->quirk_list == 2);

	tp_ops->write_devctl(hwif, (drive->quirk_list == 2 ? 0 : ATA_NIEN) |

			     ATA_DEVCTL_OBS);

	/* more than enough time */

	udelay(10);

	hwif->poll_timeout = jiffies + WAIT_WORSTCASE;

drivers/ide/ide-h8300.c

+1 −2
Original line number Diff line number Diff line
@@ -159,8 +159,7 @@ static const struct ide_tp_ops h8300_tp_ops = { 
	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,



	.set_irq		= ide_set_irq,

	.write_devctl		= ide_write_devctl,



	.tf_load		= h8300_tf_load,

	.tf_read		= h8300_tf_read,