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

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

ide: turn selectproc() method into dev_select() method (take 5) 



Turn selectproc() method into dev_select() method by teaching it to write to the
device register and moving it from 'struct ide_port_ops' to 'struct ide_tp_ops'.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: benh@kernel.crashing.org
Cc: petkovbb@gmail.com
[bart: add ->dev_select to at91_ide.c and tx4939.c (__BIG_ENDIAN case)]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 0f861e8c

drivers/ide/at91_ide.c

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ static const struct ide_tp_ops at91_ide_tp_ops = { 
	.read_altstatus	= ide_read_altstatus,

	.write_devctl	= ide_write_devctl,



	.dev_select	= ide_dev_select,

	.tf_load	= at91_ide_tf_load,

	.tf_read	= at91_ide_tf_read,

drivers/ide/au1xxx-ide.c

+1 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ static const struct ide_tp_ops au1xxx_tp_ops = { 
	.read_altstatus		= ide_read_altstatus,

	.write_devctl		= ide_write_devctl,



	.dev_select		= ide_dev_select,

	.tf_load		= ide_tf_load,

	.tf_read		= ide_tf_read,

drivers/ide/falconide.c

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ static const struct ide_tp_ops falconide_tp_ops = { 
	.read_altstatus		= ide_read_altstatus,

	.write_devctl		= ide_write_devctl,



	.dev_select		= ide_dev_select,

	.tf_load		= ide_tf_load,

	.tf_read		= ide_tf_read,

drivers/ide/ht6560b.c

+18 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ 
/*

 * This routine is invoked from ide.c to prepare for access to a given drive.

 */

static void ht6560b_selectproc (ide_drive_t *drive)

static void ht6560b_dev_select(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	unsigned long flags;
@@ -143,6 +143,8 @@ static void ht6560b_selectproc (ide_drive_t *drive) 
#endif

	}

	local_irq_restore(flags);



	outb(drive->select | ATA_DEVICE_OBS, hwif->io_ports.device_addr);

}



/*
@@ -305,15 +307,29 @@ static int probe_ht6560b; 
module_param_named(probe, probe_ht6560b, bool, 0);

MODULE_PARM_DESC(probe, "probe for HT6560B chipset");



static const struct ide_tp_ops ht6560b_tp_ops = {

	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,

	.write_devctl		= ide_write_devctl,



	.dev_select		= ht6560b_dev_select,

	.tf_load		= ide_tf_load,

	.tf_read		= ide_tf_read,



	.input_data		= ide_input_data,

	.output_data		= ide_output_data,

};



static const struct ide_port_ops ht6560b_port_ops = {

	.init_dev		= ht6560b_init_dev,

	.set_pio_mode		= ht6560b_set_pio_mode,

	.selectproc		= ht6560b_selectproc,

};



static const struct ide_port_info ht6560b_port_info __initdata = {

	.name			= DRV_NAME,

	.chipset		= ide_ht6560b,

	.tp_ops 		= &ht6560b_tp_ops,

	.port_ops		= &ht6560b_port_ops,

	.host_flags		= IDE_HFLAG_SERIALIZE | /* is this needed? */

				  IDE_HFLAG_NO_DMA |

drivers/ide/ide-h8300.c

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static const struct ide_tp_ops h8300_tp_ops = { 
	.read_altstatus		= ide_read_altstatus,

	.write_devctl		= ide_write_devctl,



	.dev_select		= ide_dev_select,

	.tf_load		= h8300_tf_load,

	.tf_read		= h8300_tf_read,