MIPS: Modify core io.h macros to account for the Octeon Errata Core-301.

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-lib.c

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 7913ad5d4979807da9621b4c86ff27c1b3336516..09526a0de734f279cb3f055460ff4a4add0baed1 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -273,7 +273,7 @@ int ide_set_xfer_rate(ide_drive_t *drive, u8 rate)
 
 static void ide_dump_opcode(ide_drive_t *drive)
 {
-       struct request *rq = drive->hwif->hwgroup->rq;
+       struct request *rq = drive->hwif->rq;
        ide_task_t *task = NULL;
 
        if (!rq)
@@ -346,10 +346,13 @@ static void ide_dump_ata_error(ide_drive_t *drive, u8 err)
        printk(KERN_CONT "}");
        if ((err & (ATA_BBK | ATA_ABORTED)) == ATA_BBK ||
            (err & (ATA_UNC | ATA_IDNF | ATA_AMNF))) {
+               struct request *rq = drive->hwif->rq;
+
                ide_dump_sector(drive);
-               if (HWGROUP(drive) && HWGROUP(drive)->rq)
+
+               if (rq)
                        printk(KERN_CONT ", sector=%llu",
-                              (unsigned long long)HWGROUP(drive)->rq->sector);
+                              (unsigned long long)rq->sector);
        }
        printk(KERN_CONT "\n");
 }
@@ -384,10 +387,8 @@ static void ide_dump_atapi_error(ide_drive_t *drive, u8 err)
 
 u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
 {
-       unsigned long flags;
        u8 err = 0;
 
-       local_irq_save(flags);
        printk(KERN_ERR "%s: %s: status=0x%02x { ", drive->name, msg, stat);
        if (stat & ATA_BUSY)
                printk(KERN_CONT "Busy ");
@@ -417,7 +418,6 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
                        ide_dump_atapi_error(drive, err);
        }
        ide_dump_opcode(drive);
-       local_irq_restore(flags);
        return err;
 }
 EXPORT_SYMBOL(ide_dump_status);