ide: use ->tf_read in ide_read_error()

* Add IDE_TFLAG_IN_FEATURE taskfile flag for reading Feature
  register and handle it in ->tf_read.

* Convert ide_read_error() to use ->tf_read instead of ->INB,
  then uninline and export it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

4 files changed, 21 insertions, 0 deletions

diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index a71433b3d0f3..548a2bf232c9 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -100,6 +100,8 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task)
         /* be sure we're looking at the low order bits */
         outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
+        if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
+                tf->feature = inb(io_ports->feature_addr);
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAL)
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 1983b353eb16..113db8744736 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -241,6 +241,8 @@ static void ide_tf_read(ide_drive_t *drive, ide_task_t *task)
         /* be sure we're looking at the low order bits */
         tf_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
+        if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
+                tf->feature = tf_inb(io_ports->feature_addr);
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = tf_inb(io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAL)
@@ -390,6 +392,19 @@ void default_hwif_transport(ide_hwif_t *hwif)
         hwif->output_data = ata_output_data;
 }
 
+u8 ide_read_error(ide_drive_t *drive)
+{
+        ide_task_t task;
+
+        memset(&task, 0, sizeof(task));
+        task.tf_flags = IDE_TFLAG_IN_FEATURE;
+
+        drive->hwif->tf_read(drive, &task);
+
+        return task.tf.error;
+}
+EXPORT_SYMBOL_GPL(ide_read_error);
+
 void ide_fix_driveid (struct hd_driveid *id)
 {
 #ifndef __LITTLE_ENDIAN
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index b20e5f01ac89..b9bb8428b35e 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -88,6 +88,8 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task)
         /* be sure we're looking at the low order bits */
         outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
+        if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
+                tf->feature = inb(io_ports->feature_addr);
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = inb(io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAL)
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index 727eda6db76c..c110f359b03e 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -741,6 +741,8 @@ static void scc_tf_read(ide_drive_t *drive, ide_task_t *task)
         /* be sure we're looking at the low order bits */
         scc_ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
 
+        if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
+                tf->feature = scc_ide_inb(io_ports->feature_addr);
         if (task->tf_flags & IDE_TFLAG_IN_NSECT)
                 tf->nsect  = scc_ide_inb(io_ports->nsect_addr);
         if (task->tf_flags & IDE_TFLAG_IN_LBAL)