ide: remove atapi_error_t (take 2)

Remove atapi_error_t.

While at it:
* replace 'HWIF(drive)' by 'drive->hwif'

v2:
* Add {ILI,EOM,LFS}_ERR defines to <linux/hdreg.h>.

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

3 files changed, 12 insertions, 15 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 7b94c7aff256..2a37a08ddd57 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -772,9 +772,8 @@ static void idefloppy_retry_pc (ide_drive_t *drive)
 {
         idefloppy_pc_t *pc;
         struct request *rq;
-        atapi_error_t error;
 
-        error.all = HWIF(drive)->INB(IDE_ERROR_REG);
+        (void)drive->hwif->INB(IDE_ERROR_REG);
         pc = idefloppy_next_pc_storage(drive);
         rq = idefloppy_next_rq_storage(drive);
         idefloppy_create_request_sense_cmd(pc);
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index dc7e539b4d0b..562f5efae9c6 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -562,9 +562,8 @@ static u8 ide_dump_ata_status(ide_drive_t *drive, const char *msg, u8 stat)
 static u8 ide_dump_atapi_status(ide_drive_t *drive, const char *msg, u8 stat)
 {
         unsigned long flags;
-        atapi_error_t error;
+        u8 err = 0;
 
-        error.all = 0;
         local_irq_save(flags);
         printk("%s: %s: status=0x%02x { ", drive->name, msg, stat);
         if (stat & BUSY_STAT)
@@ -580,19 +579,19 @@ static u8 ide_dump_atapi_status(ide_drive_t *drive, const char *msg, u8 stat)
         }
         printk("}\n");
         if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
-                error.all = HWIF(drive)->INB(IDE_ERROR_REG);
-                printk("%s: %s: error=0x%02x { ", drive->name, msg, error.all);
-                if (error.b.ili)        printk("IllegalLengthIndication ");
-                if (error.b.eom)        printk("EndOfMedia ");
-                if (error.b.abrt)       printk("AbortedCommand ");
-                if (error.b.mcr)        printk("MediaChangeRequested ");
-                if (error.b.sense_key)  printk("LastFailedSense=0x%02x ",
-                                                error.b.sense_key);
+                err = drive->hwif->INB(IDE_ERROR_REG);
+                printk("%s: %s: error=0x%02x { ", drive->name, msg, err);
+                if (err & ILI_ERR)      printk("IllegalLengthIndication ");
+                if (err & EOM_ERR)      printk("EndOfMedia ");
+                if (err & ABRT_ERR)     printk("AbortedCommand ");
+                if (err & MCR_ERR)      printk("MediaChangeRequested ");
+                if (err & LFS_ERR)      printk("LastFailedSense=0x%02x ",
+                                                (err & LFS_ERR) >> 4);
                 printk("}\n");
         }
         ide_dump_opcode(drive);
         local_irq_restore(flags);
-        return error.all;
+        return err;
 }
 
 /**
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index c91039505436..2c03f469f06e 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1808,9 +1808,8 @@ static ide_startstop_t idetape_retry_pc (ide_drive_t *drive)
         idetape_tape_t *tape = drive->driver_data;
         idetape_pc_t *pc;
         struct request *rq;
-        atapi_error_t error;
 
-        error.all = HWIF(drive)->INB(IDE_ERROR_REG);
+        (void)drive->hwif->INB(IDE_ERROR_REG);
         pc = idetape_next_pc_storage(drive);
         rq = idetape_next_rq_storage(drive);
         idetape_create_request_sense_cmd(pc);