ide: add ide_read_[alt]status() inline helpers

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 4bddef0c0b96..29cb043a2d3a 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -466,7 +466,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
                 return ide_stopped;
         }
 
-        if (hwif->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT))
+        if (ide_read_status(drive) & (BUSY_STAT | DRQ_STAT))
                 rq->errors |= ERROR_RESET;
 
         if ((rq->errors & ERROR_RESET) == ERROR_RESET) {
@@ -493,7 +493,7 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u
                 /* add decoding error stuff */
         }
 
-        if (hwif->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT))
+        if (ide_read_status(drive) & (BUSY_STAT | DRQ_STAT))
                 /* force an abort */
                 hwif->OUTB(WIN_IDLEIMMEDIATE, IDE_COMMAND_REG);
 
@@ -821,8 +821,7 @@ 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,
-                        hwif->INB(IDE_STATUS_REG),
+        ide_end_drive_cmd(drive, ide_read_status(drive),
                         hwif->INB(IDE_ERROR_REG));
         return ide_stopped;
 }
@@ -1231,7 +1230,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
                 printk(KERN_WARNING "%s: DMA timeout error\n", drive->name);
                 (void)HWIF(drive)->ide_dma_end(drive);
                 ret = ide_error(drive, "dma timeout error",
-                                                hwif->INB(IDE_STATUS_REG));
+                                ide_read_status(drive));
         } else {
                 printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
                 hwif->dma_timeout(drive);
@@ -1355,7 +1354,8 @@ void ide_timer_expiry (unsigned long data)
                                         startstop = ide_dma_timeout_retry(drive, wait);
                                 } else
                                         startstop =
-                                        ide_error(drive, "irq timeout", hwif->INB(IDE_STATUS_REG));
+                                        ide_error(drive, "irq timeout",
+                                                  ide_read_status(drive));
                         }
                         drive->service_time = jiffies - drive->service_start;
                         spin_lock_irq(&ide_lock);