Commit 27f00e53 authored Mar 27, 2015 by Hannes Reinecke Committed by Tejun Heo Mar 27, 2015

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>

parent 8ae72044

drivers/ata/libata-scsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");

drivers/ide/ide-lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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 ");
		}

drivers/ide/ide-probe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",

include/linux/ata.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */