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

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

ide: inline SELECT_DRIVE() 



Since SELECT_DRIVE() has boiled down to a mere dev_select() method call, it now
makes sense to just inline it...

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

drivers/ide/ide-eh.c

+4 −3
Original line number Diff line number Diff line
@@ -165,11 +165,12 @@ static ide_startstop_t do_reset1(ide_drive_t *, int); 
static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	const struct ide_tp_ops *tp_ops = hwif->tp_ops;

	u8 stat;



	SELECT_DRIVE(drive);

	tp_ops->dev_select(drive);

	udelay(10);

	stat = hwif->tp_ops->read_status(hwif);

	stat = tp_ops->read_status(hwif);



	if (OK_STAT(stat, 0, ATA_BUSY))

		printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);
@@ -348,7 +349,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi) 
	/* For an ATAPI device, first try an ATAPI SRST. */

	if (drive->media != ide_disk && !do_not_try_atapi) {

		pre_reset(drive);

		SELECT_DRIVE(drive);

		tp_ops->dev_select(drive);

		udelay(20);

		tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);

		ndelay(400);

drivers/ide/ide-io.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) 
	if (blk_pm_request(rq))

		ide_check_pm_state(drive, rq);



	SELECT_DRIVE(drive);

	drive->hwif->tp_ops->dev_select(drive);

	if (ide_wait_stat(&startstop, drive, drive->ready_stat,

			  ATA_BUSY | ATA_DRQ, WAIT_READY)) {

		printk(KERN_ERR "%s: drive not ready for command\n", drive->name);

drivers/ide/ide-iops.c

+1 −6
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ 
#include <asm/uaccess.h>

#include <asm/io.h>



void SELECT_DRIVE(ide_drive_t *drive)

{

	drive->hwif->tp_ops->dev_select(drive);

}



void SELECT_MASK(ide_drive_t *drive, int mask)

{

	const struct ide_port_ops *port_ops = drive->hwif->port_ops;
@@ -347,7 +342,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) 
	disable_irq_nosync(hwif->irq);



	udelay(1);

	SELECT_DRIVE(drive);

	tp_ops->dev_select(drive);

	SELECT_MASK(drive, 1);

	udelay(1);

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

drivers/ide/ide-pm.c

+3 −2
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq) 
		 * point.

		 */

		ide_hwif_t *hwif = drive->hwif;

		const struct ide_tp_ops *tp_ops = hwif->tp_ops;

		struct request_queue *q = drive->queue;

		unsigned long flags;

		int rc;
@@ -232,8 +233,8 @@ void ide_check_pm_state(ide_drive_t *drive, struct request *rq) 
		rc = ide_wait_not_busy(hwif, 35000);

		if (rc)

			printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);

		SELECT_DRIVE(drive);

		hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);

		tp_ops->dev_select(drive);

		tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);

		rc = ide_wait_not_busy(hwif, 100000);

		if (rc)

			printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);

drivers/ide/ide-probe.c

+8 −7
Original line number Diff line number Diff line
@@ -390,13 +390,13 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
	 * (e.g. crw9624 as drive0 with disk as slave)

	 */

	msleep(50);

	SELECT_DRIVE(drive);

	tp_ops->dev_select(drive);

	msleep(50);



	if (ide_read_device(drive) != drive->select && present == 0) {

		if (drive->dn & 1) {

			/* exit with drive0 selected */

			SELECT_DRIVE(hwif->devices[0]);

			tp_ops->dev_select(hwif->devices[0]);

			/* allow ATA_BUSY to assert & clear */

			msleep(50);

		}
@@ -422,7 +422,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
			printk(KERN_ERR "%s: no response (status = 0x%02x), "

					"resetting drive\n", drive->name, stat);

			msleep(50);

			SELECT_DRIVE(drive);

			tp_ops->dev_select(drive);

			msleep(50);

			tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);

			(void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);
@@ -441,7 +441,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd) 
	}

	if (drive->dn & 1) {

		/* exit with drive0 selected */

		SELECT_DRIVE(hwif->devices[0]);

		tp_ops->dev_select(hwif->devices[0]);

		msleep(50);

		/* ensure drive irq is clear */

		(void)tp_ops->read_status(hwif);
@@ -605,6 +605,7 @@ static int ide_register_port(ide_hwif_t *hwif) 


static int ide_port_wait_ready(ide_hwif_t *hwif)

{

	const struct ide_tp_ops *tp_ops = hwif->tp_ops;

	ide_drive_t *drive;

	int i, rc;
@@ -627,8 +628,8 @@ static int ide_port_wait_ready(ide_hwif_t *hwif) 
		/* Ignore disks that we will not probe for later. */

		if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0 ||

		    (drive->dev_flags & IDE_DFLAG_PRESENT)) {

			SELECT_DRIVE(drive);

			hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);

			tp_ops->dev_select(drive);

			tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);

			mdelay(2);

			rc = ide_wait_not_busy(hwif, 35000);

			if (rc)
@@ -640,7 +641,7 @@ static int ide_port_wait_ready(ide_hwif_t *hwif) 
out:

	/* Exit function with master reselected (let's be sane) */

	if (i)

		SELECT_DRIVE(hwif->devices[0]);

		tp_ops->dev_select(hwif->devices[0]);



	return rc;

}