diff options
| author | Hannes Reinecke <hare@suse.de> | 2015-03-27 16:46:33 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-03-27 16:59:22 +0100 |
| commit | 27f00e53af72702d3a9e6f75590e66fe04914149 (patch) | |
| tree | bd3fa2052313ada98842cfeb43ae18dbbfb8bc28 /drivers | |
| parent | libata: whitespace fixes in ata_to_sense_error() (diff) | |
| download | linux-27f00e53af72702d3a9e6f75590e66fe04914149.tar.xz linux-27f00e53af72702d3a9e6f75590e66fe04914149.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-lib.c | 4 | ||||
| -rw-r--r-- | drivers/ide/ide-probe.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 25d8b648ad38..b96e3b71434d 100644 --- 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 d9c9829c8b20..e1180fa46196 100644 --- 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 a3d3b1733c49..0b63facd1d87 100644 --- 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", |