UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Hannes Reinecke 2015-03-27 16:46:33 +01:00 committed by Tejun Heo
parent 8ae720449f
commit 27f00e53af
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/libata-scsi.c
View File

@ -804,7 +804,7 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf)
if (stat & 0x10) printk("SeekComplete "); if (stat & 0x10) printk("SeekComplete ");
if (stat & 0x08) printk("DataRequest "); if (stat & 0x08) printk("DataRequest ");
if (stat & 0x04) printk("CorrectedError "); if (stat & 0x04) printk("CorrectedError ");
if (stat & 0x02) printk("Index "); if (stat & 0x02) printk("Sense ");
if (stat & 0x01) printk("Error "); if (stat & 0x01) printk("Error ");
printk("}\n"); printk("}\n");

4
drivers/ide/ide-lib.c
View File

@ -148,8 +148,8 @@ u8 ide_dump_status(ide_drive_t *drive, const char *msg, u8 stat)
printk(KERN_CONT "DataRequest "); printk(KERN_CONT "DataRequest ");
if (stat & ATA_CORR) if (stat & ATA_CORR)
printk(KERN_CONT "CorrectedError "); printk(KERN_CONT "CorrectedError ");
if (stat & ATA_IDX) if (stat & ATA_SENSE)
printk(KERN_CONT "Index "); printk(KERN_CONT "Sense ");
if (stat & ATA_ERR) if (stat & ATA_ERR)
printk(KERN_CONT "Error "); printk(KERN_CONT "Error ");
} }

2
drivers/ide/ide-probe.c
View File

@ -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) { (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) {
a = tp_ops->read_altstatus(hwif); a = tp_ops->read_altstatus(hwif);
s = tp_ops->read_status(hwif); s = tp_ops->read_status(hwif);
if ((a ^ s) & ~ATA_IDX) if ((a ^ s) & ~ATA_SENSE)
/* ancient Seagate drives, broken interfaces */ /* ancient Seagate drives, broken interfaces */
printk(KERN_INFO "%s: probing with STATUS(0x%02x) " printk(KERN_INFO "%s: probing with STATUS(0x%02x) "
"instead of ALTSTATUS(0x%02x)\n", "instead of ALTSTATUS(0x%02x)\n",

2
include/linux/ata.h
View File

@ -177,7 +177,7 @@ enum {
ATA_DSC = (1 << 4), /* drive seek complete */ ATA_DSC = (1 << 4), /* drive seek complete */
ATA_DRQ = (1 << 3), /* data request i/o */ ATA_DRQ = (1 << 3), /* data request i/o */
ATA_CORR = (1 << 2), /* corrected data error */ 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_ERR = (1 << 0), /* have an error */
ATA_SRST = (1 << 2), /* software reset */ ATA_SRST = (1 << 2), /* software reset */
ATA_ICRC = (1 << 7), /* interface CRC error */ ATA_ICRC = (1 << 7), /* interface CRC error */