8 files changed, 18 insertions, 10 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 892e42e80a32..5e42c19a03e3 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -304,7 +304,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
                 return 0;
 
         /* Get the IDE error register. */
-        err = HWIF(drive)->INB(IDE_ERROR_REG);
+        err = ide_read_error(drive);
         sense_key = err >> 4;
 
         if (rq == NULL) {
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 3ac79ed2bc63..faf22d716f80 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -465,7 +465,7 @@ static void idefloppy_retry_pc(ide_drive_t *drive)
         idefloppy_pc_t *pc;
         struct request *rq;
 
-        (void)drive->hwif->INB(IDE_ERROR_REG);
+        (void)ide_read_error(drive);
         pc = idefloppy_next_pc_storage(drive);
         rq = idefloppy_next_rq_storage(drive);
         idefloppy_create_request_sense_cmd(pc);
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 29cb043a2d3a..3addbe478d26 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -821,8 +821,8 @@ static ide_startstop_t execute_drive_cmd (ide_drive_t *drive,
 #ifdef DEBUG
         printk("%s: DRIVE_CMD (null)\n", drive->name);
 #endif
-        ide_end_drive_cmd(drive, ide_read_status(drive),
-                        hwif->INB(IDE_ERROR_REG));
+        ide_end_drive_cmd(drive, ide_read_status(drive), ide_read_error(drive));
+
         return ide_stopped;
 }
 
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 716244c45211..c32e759df208 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -918,7 +918,9 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
                 drive->failures++;
         } else  {
                 printk("%s: reset: ", hwif->name);
-                if ((tmp = hwif->INB(IDE_ERROR_REG)) == 1) {
+                tmp = ide_read_error(drive);
+
+                if (tmp == 1) {
                         printk("success\n");
                         drive->failures = 0;
                 } else {
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index b42940d8bf70..1ff676cc6473 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -578,7 +578,7 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
         }
         printk("}\n");
         if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
-                err = drive->hwif->INB(IDE_ERROR_REG);
+                err = ide_read_error(drive);
                 printk("%s: %s: error=0x%02x ", drive->name, msg, err);
                 if (drive->media == ide_disk)
                         ide_dump_ata_error(drive, err);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 66801c084dd8..401731302c5c 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1125,7 +1125,7 @@ static ide_startstop_t idetape_retry_pc (ide_drive_t *drive)
         idetape_pc_t *pc;
         struct request *rq;
 
-        (void)drive->hwif->INB(IDE_ERROR_REG);
+        (void)ide_read_error(drive);
         pc = idetape_next_pc_storage(drive);
         rq = idetape_next_rq_storage(drive);
         idetape_create_request_sense_cmd(pc);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 2545dde6ee02..0518a2e948cf 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -241,7 +241,6 @@ static ide_startstop_t recal_intr(ide_drive_t *drive)
 static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
 {
         ide_task_t *args        = HWGROUP(drive)->rq->special;
-        ide_hwif_t *hwif        = HWIF(drive);
         u8 stat;
 
         local_irq_enable_in_hardirq();
@@ -252,7 +251,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
                 /* calls ide_end_drive_cmd */
 
         if (args)
-                ide_end_drive_cmd(drive, stat, hwif->INB(IDE_ERROR_REG));
+                ide_end_drive_cmd(drive, stat, ide_read_error(drive));
 
         return ide_stopped;
 }
@@ -408,7 +407,7 @@ static ide_startstop_t task_error(ide_drive_t *drive, struct request *rq,
 void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 {
         if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
-                u8 err = drive->hwif->INB(IDE_ERROR_REG);
+                u8 err = ide_read_error(drive);
 
                 ide_end_drive_cmd(drive, stat, err);
                 return;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index d2124920ff10..acec99da832d 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1323,4 +1323,11 @@ static inline u8 ide_read_altstatus(ide_drive_t *drive)
         return hwif->INB(hwif->io_ports[IDE_CONTROL_OFFSET]);
 }
 
+static inline u8 ide_read_error(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+
+        return hwif->INB(hwif->io_ports[IDE_ERROR_OFFSET]);
+}
+
 #endif /* _IDE_H */