ide,ata: Rename ATA_IDX to ATA_SENSE

ATA-8 defines bit 1 as 'ATA_SENSE', not 'ATA_IDX'.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 25d8b648ad38453087d7dd10326bc02ea7d40d42..b96e3b71434d5824db8c615242a4f22af6c73ef9 100644 (file)
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -804,7 +804,7 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf)
                if (stat & 0x10)        printk("SeekComplete ");
                if (stat & 0x08)        printk("DataRequest ");
                if (stat & 0x04)        printk("CorrectedError ");
-               if (stat & 0x02)        printk("Index ");
+               if (stat & 0x02)        printk("Sense ");
                if (stat & 0x01)        printk("Error ");
                printk("}\n");
 

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index d9c9829c8b206118b665d282f847e7809887fb33..e1180fa461969d01bd7581b52e7ba0da84ab7dfe 100644 (file)
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -148,8 +148,8 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
                        printk(KERN_CONT "DataRequest ");
                if (stat & ATA_CORR)
                        printk(KERN_CONT "CorrectedError ");
-               if (stat & ATA_IDX)
-                       printk(KERN_CONT "Index ");
+               if (stat & ATA_SENSE)
+                       printk(KERN_CONT "Sense ");
                if (stat & ATA_ERR)
                        printk(KERN_CONT "Error ");
        }

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a3d3b1733c49c667f7f1495d9dfef23623e28fa0..0b63facd1d87d0def87864ee946ef92e179e3d1e 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -273,7 +273,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id, int irq_ctx)
            (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
                a = tp_ops->read_altstatus(hwif);
                s = tp_ops->read_status(hwif);
-               if ((a ^ s) & ~ATA_IDX)
+               if ((a ^ s) & ~ATA_SENSE)
                        /* ancient Seagate drives, broken interfaces */
                        printk(KERN_INFO "%s: probing with STATUS(0x%02x) "
                                         "instead of ALTSTATUS(0x%02x)\n",

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 681520f8a3dee38930399574906e8ceddc2e4e02..e3cb41c17ba7c2cdfad28b91fbbbaa7000ce03af 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -177,7 +177,7 @@ enum {
        ATA_DSC                 = (1 << 4),     /* drive seek complete */
        ATA_DRQ                 = (1 << 3),     /* data request i/o */
        ATA_CORR                = (1 << 2),     /* corrected data error */
-       ATA_IDX                 = (1 << 1),     /* index */
+       ATA_SENSE               = (1 << 1),     /* sense code available */
        ATA_ERR                 = (1 << 0),     /* have an error */
        ATA_SRST                = (1 << 2),     /* software reset */
        ATA_ICRC                = (1 << 7),     /* interface CRC error */