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: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sergei Shtylyov · Bartlomiej Zolnierkiewicz
1 parent abb596b25e
Showing 7 changed files with 18 additions and 21 deletions Side-by-side Diff
drivers/ide/ide-eh.c
drivers/ide/ide-io.c
drivers/ide/ide-iops.c
drivers/ide/ide-pm.c
drivers/ide/ide-probe.c
drivers/ide/ns87415.c
include/linux/ide.h
@@ -165,11 +165,12 @@
 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 @@
 	/* 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);
@@ -348,7 +348,7 @@
 	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);
@@ -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 @@
 	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);
@@ -223,6 +223,7 @@
 		 * 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 @@
 		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);
@@ -390,13 +390,13 @@
 	 * (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 @@
 			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 @@
 	}
 	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_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 @@
 		/* 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 @@
 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;
 }
@@ -262,7 +262,7 @@
 #ifdef __sparc_v9__
 		/*
 		 * XXX: Reset the device, if we don't it will not respond to
-		 *      SELECT_DRIVE() properly during first ide_probe_port().
+		 *      dev_select() properly during first ide_probe_port().
 		 */
 		timeout = 10000;
 		outb(12, hwif->io_ports.ctl_addr);
@@ -1176,7 +1176,6 @@
 void ide_input_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
 void ide_output_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);
  
-extern void SELECT_DRIVE(ide_drive_t *);
 void SELECT_MASK(ide_drive_t *, int);
  
 u8 ide_read_error(ide_drive_t *);
...	...	@@ -165,11 +165,12 @@
165	165	static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive)
166	166	{
167	167	ide_hwif_t *hwif = drive->hwif;
	168	+ const struct ide_tp_ops *tp_ops = hwif->tp_ops;
168	169	u8 stat;
169	170
170		- SELECT_DRIVE(drive);
	171	+ tp_ops->dev_select(drive);
171	172	udelay(10);
172		- stat = hwif->tp_ops->read_status(hwif);
	173	+ stat = tp_ops->read_status(hwif);
173	174
174	175	if (OK_STAT(stat, 0, ATA_BUSY))
175	176	printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);
...	...	@@ -348,7 +349,7 @@
348	349	/* For an ATAPI device, first try an ATAPI SRST. */
349	350	if (drive->media != ide_disk && !do_not_try_atapi) {
350	351	pre_reset(drive);
351		- SELECT_DRIVE(drive);
	352	+ tp_ops->dev_select(drive);
352	353	udelay(20);
353	354	tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
354	355	ndelay(400);
...	...	@@ -348,7 +348,7 @@
348	348	if (blk_pm_request(rq))
349	349	ide_check_pm_state(drive, rq);
350	350
351		- SELECT_DRIVE(drive);
	351	+ drive->hwif->tp_ops->dev_select(drive);
352	352	if (ide_wait_stat(&startstop, drive, drive->ready_stat,
353	353	ATA_BUSY \| ATA_DRQ, WAIT_READY)) {
354	354	printk(KERN_ERR "%s: drive not ready for command\n", drive->name);
...	...	@@ -27,11 +27,6 @@
27	27	#include <asm/uaccess.h>
28	28	#include <asm/io.h>
29	29
30		-void SELECT_DRIVE(ide_drive_t *drive)
31		-{
32		- drive->hwif->tp_ops->dev_select(drive);
33		-}
34		-
35	30	void SELECT_MASK(ide_drive_t *drive, int mask)
36	31	{
37	32	const struct ide_port_ops *port_ops = drive->hwif->port_ops;
...	...	@@ -347,7 +342,7 @@
347	342	disable_irq_nosync(hwif->irq);
348	343
349	344	udelay(1);
350		- SELECT_DRIVE(drive);
	345	+ tp_ops->dev_select(drive);
351	346	SELECT_MASK(drive, 1);
352	347	udelay(1);
353	348	tp_ops->write_devctl(hwif, ATA_NIEN \| ATA_DEVCTL_OBS);
...	...	@@ -223,6 +223,7 @@
223	223	* point.
224	224	*/
225	225	ide_hwif_t *hwif = drive->hwif;
	226	+ const struct ide_tp_ops *tp_ops = hwif->tp_ops;
226	227	struct request_queue *q = drive->queue;
227	228	unsigned long flags;
228	229	int rc;
...	...	@@ -232,8 +233,8 @@
232	233	rc = ide_wait_not_busy(hwif, 35000);
233	234	if (rc)
234	235	printk(KERN_WARNING "%s: bus not ready on wakeup\n", drive->name);
235		- SELECT_DRIVE(drive);
236		- hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
	236	+ tp_ops->dev_select(drive);
	237	+ tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
237	238	rc = ide_wait_not_busy(hwif, 100000);
238	239	if (rc)
239	240	printk(KERN_WARNING "%s: drive not ready on wakeup\n", drive->name);
...	...	@@ -390,13 +390,13 @@
390	390	* (e.g. crw9624 as drive0 with disk as slave)
391	391	*/
392	392	msleep(50);
393		- SELECT_DRIVE(drive);
	393	+ tp_ops->dev_select(drive);
394	394	msleep(50);
395	395
396	396	if (ide_read_device(drive) != drive->select && present == 0) {
397	397	if (drive->dn & 1) {
398	398	/* exit with drive0 selected */
399		- SELECT_DRIVE(hwif->devices[0]);
	399	+ tp_ops->dev_select(hwif->devices[0]);
400	400	/* allow ATA_BUSY to assert & clear */
401	401	msleep(50);
402	402	}
...	...	@@ -422,7 +422,7 @@
422	422	printk(KERN_ERR "%s: no response (status = 0x%02x), "
423	423	"resetting drive\n", drive->name, stat);
424	424	msleep(50);
425		- SELECT_DRIVE(drive);
	425	+ tp_ops->dev_select(drive);
426	426	msleep(50);
427	427	tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
428	428	(void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);
...	...	@@ -441,7 +441,7 @@
441	441	}
442	442	if (drive->dn & 1) {
443	443	/* exit with drive0 selected */
444		- SELECT_DRIVE(hwif->devices[0]);
	444	+ tp_ops->dev_select(hwif->devices[0]);
445	445	msleep(50);
446	446	/* ensure drive irq is clear */
447	447	(void)tp_ops->read_status(hwif);
...	...	@@ -605,6 +605,7 @@
605	605
606	606	static int ide_port_wait_ready(ide_hwif_t *hwif)
607	607	{
	608	+ const struct ide_tp_ops *tp_ops = hwif->tp_ops;
608	609	ide_drive_t *drive;
609	610	int i, rc;
610	611
...	...	@@ -627,8 +628,8 @@
627	628	/* Ignore disks that we will not probe for later. */
628	629	if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0 \|\|
629	630	(drive->dev_flags & IDE_DFLAG_PRESENT)) {
630		- SELECT_DRIVE(drive);
631		- hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
	631	+ tp_ops->dev_select(drive);
	632	+ tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
632	633	mdelay(2);
633	634	rc = ide_wait_not_busy(hwif, 35000);
634	635	if (rc)
...	...	@@ -640,7 +641,7 @@
640	641	out:
641	642	/* Exit function with master reselected (let's be sane) */
642	643	if (i)
643		- SELECT_DRIVE(hwif->devices[0]);
	644	+ tp_ops->dev_select(hwif->devices[0]);
644	645
645	646	return rc;
646	647	}
...	...	@@ -262,7 +262,7 @@
262	262	#ifdef __sparc_v9__
263	263	/*
264	264	* XXX: Reset the device, if we don't it will not respond to
265		- * SELECT_DRIVE() properly during first ide_probe_port().
	265	+ * dev_select() properly during first ide_probe_port().
266	266	*/
267	267	timeout = 10000;
268	268	outb(12, hwif->io_ports.ctl_addr);
...	...	@@ -1176,7 +1176,6 @@
1176	1176	void ide_input_data(ide_drive_t , struct ide_cmd , void *, unsigned int);
1177	1177	void ide_output_data(ide_drive_t , struct ide_cmd , void *, unsigned int);
1178	1178
1179		-extern void SELECT_DRIVE(ide_drive_t *);
1180	1179	void SELECT_MASK(ide_drive_t *, int);
1181	1180
1182	1181	u8 ide_read_error(ide_drive_t *);