From 0dfc378f0e68072b5c7ad25a1e31313c783e7c6e Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Wed, 8 Apr 2009 14:13:02 +0200
Subject: [PATCH] --- yaml --- r: 142975 b: refs/heads/master c:
 30881b9ac91e7c23e0ceb8414ab7de1961809bdd h: refs/heads/master i:   142973:
 e665fd4a1c5dda314745bf6d0bcfab7b1a688d7a   142971:
 fac0c506a9770852e76ced2b87897e54f4d37ad1   142967:
 3caa7fb41fdba5586fd649adfa21f47c00e3ff6d   142959:
 76934c1641695969587a3596a4d2800b7e9fb4f2   142943:
 bedf94444bf608c2245c2d3a95fa0a3145731dad   142911:
 d13741f542fc0f42140e14238dd7e8767523adc6   142847:
 492db4f97ea062c4805aaebb467280bb30cd9d1b v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/ide/ide-io-std.c | 12 ++++--------
 trunk/drivers/ide/ns87415.c    |  4 ++--
 trunk/drivers/ide/scc_pata.c   |  4 ++--
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index ff8cd8a978be..69d518a79a4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4109d19af73826aa6fee1a1b951670381be88f8b
+refs/heads/master: 30881b9ac91e7c23e0ceb8414ab7de1961809bdd
diff --git a/trunk/drivers/ide/ide-io-std.c b/trunk/drivers/ide/ide-io-std.c
index 7950b3bb4312..66c27768e85b 100644
--- a/trunk/drivers/ide/ide-io-std.c
+++ b/trunk/drivers/ide/ide-io-std.c
@@ -133,21 +133,17 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 	ide_hwif_t *hwif = drive->hwif;
 	struct ide_io_ports *io_ports = &hwif->io_ports;
 	struct ide_taskfile *tf = &cmd->tf;
-	void (*tf_outb)(u8 addr, unsigned long port);
 	u8 (*tf_inb)(unsigned long port);
 	u8 valid = cmd->valid.in.tf;
 	u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
 
-	if (mmio) {
-		tf_outb = ide_mm_outb;
+	if (mmio)
 		tf_inb  = ide_mm_inb;
-	} else {
-		tf_outb = ide_outb;
+	else
 		tf_inb  = ide_inb;
-	}
 
 	/* be sure we're looking at the low order bits */
-	tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
+	hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
 
 	if (valid & IDE_VALID_ERROR)
 		tf->error  = tf_inb(io_ports->feature_addr);
@@ -163,7 +159,7 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 		tf->device = tf_inb(io_ports->device_addr);
 
 	if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-		tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
+		hwif->tp_ops->write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
 
 		tf = &cmd->hob;
 		valid = cmd->valid.in.hob;
diff --git a/trunk/drivers/ide/ns87415.c b/trunk/drivers/ide/ns87415.c
index 3ab5bb196d2f..f1305f4d2be7 100644
--- a/trunk/drivers/ide/ns87415.c
+++ b/trunk/drivers/ide/ns87415.c
@@ -68,7 +68,7 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 	u8 valid = cmd->valid.in.tf;
 
 	/* be sure we're looking at the low order bits */
-	outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
+	ide_write_devctl(hwif, ATA_DEVCTL_OBS);
 
 	if (valid & IDE_VALID_ERROR)
 		tf->error  = inb(io_ports->feature_addr);
@@ -84,7 +84,7 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 		tf->device = superio_ide_inb(io_ports->device_addr);
 
 	if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-		outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
+		ide_write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
 
 		tf = &cmd->hob;
 		valid = cmd->valid.in.hob;
diff --git a/trunk/drivers/ide/scc_pata.c b/trunk/drivers/ide/scc_pata.c
index f5a6fa0a8bea..feabf5487049 100644
--- a/trunk/drivers/ide/scc_pata.c
+++ b/trunk/drivers/ide/scc_pata.c
@@ -686,7 +686,7 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 	u8 valid = cmd->valid.in.tf;
 
 	/* be sure we're looking at the low order bits */
-	scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
+	scc_write_devctl(hwif, ATA_DEVCTL_OBS);
 
 	if (valid & IDE_VALID_ERROR)
 		tf->error  = scc_ide_inb(io_ports->feature_addr);
@@ -702,7 +702,7 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
 		tf->device = scc_ide_inb(io_ports->device_addr);
 
 	if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-		scc_ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
+		scc_write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
 
 		tf = &cmd->hob;
 		valid = cmd->valid.in.hob;