Skip to content

Commit 27f00e5

Browse files
hreineckehtejun
authored andcommitted
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>
1 parent 8ae7204 commit 27f00e5

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

drivers/ata/libata-scsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf)
804804
if (stat & 0x10) printk("SeekComplete ");
805805
if (stat & 0x08) printk("DataRequest ");
806806
if (stat & 0x04) printk("CorrectedError ");
807-
if (stat & 0x02) printk("Index ");
807+
if (stat & 0x02) printk("Sense ");
808808
if (stat & 0x01) printk("Error ");
809809
printk("}\n");
810810

drivers/ide/ide-lib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
148148
printk(KERN_CONT "DataRequest ");
149149
if (stat & ATA_CORR)
150150
printk(KERN_CONT "CorrectedError ");
151-
if (stat & ATA_IDX)
152-
printk(KERN_CONT "Index ");
151+
if (stat & ATA_SENSE)
152+
printk(KERN_CONT "Sense ");
153153
if (stat & ATA_ERR)
154154
printk(KERN_CONT "Error ");
155155
}

drivers/ide/ide-probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id, int irq_ctx)
273273
(hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
274274
a = tp_ops->read_altstatus(hwif);
275275
s = tp_ops->read_status(hwif);
276-
if ((a ^ s) & ~ATA_IDX)
276+
if ((a ^ s) & ~ATA_SENSE)
277277
/* ancient Seagate drives, broken interfaces */
278278
printk(KERN_INFO "%s: probing with STATUS(0x%02x) "
279279
"instead of ALTSTATUS(0x%02x)\n",

include/linux/ata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ enum {
177177
ATA_DSC = (1 << 4), /* drive seek complete */
178178
ATA_DRQ = (1 << 3), /* data request i/o */
179179
ATA_CORR = (1 << 2), /* corrected data error */
180-
ATA_IDX = (1 << 1), /* index */
180+
ATA_SENSE = (1 << 1), /* sense code available */
181181
ATA_ERR = (1 << 0), /* have an error */
182182
ATA_SRST = (1 << 2), /* software reset */
183183
ATA_ICRC = (1 << 7), /* interface CRC error */

0 commit comments

Comments
 (0)