ide: use ATA_* defines instead of *_STAT and *_ERR ones

* ERR_STAT   -> ATA_ERR
* INDEX_STAT -> ATA_IDX
* ECC_STAT   -> ATA_CORR
* DRQ_STAT   -> ATA_DRQ
* SEEK_STAT  -> ATA_DSC
* WRERR_STAT -> ATA_DF
* READY_STAT -> ATA_DRDY
* BUSY_STAT  -> ATA_BUSY

* MARK_ERR   -> ATA_AMNF
* TRK0_ERR   -> ATA_TRK0NF
* ABRT_ERR   -> ATA_ABORTED
* MCR_ERR    -> ATA_MCR
* ID_ERR     -> ATA_IDNF
* MC_ERR     -> ATA_MC
* ECC_ERR    -> ATA_UNC
* ICRC_ERR   -> ATA_ICRC

* BBD_ERR    -> ATA_BBK

Also:

* ILI_ERR    -> ATAPI_ILI
* EOM_ERR    -> ATAPI_EOM
* LFS_ERR    -> ATAPI_LFS

* CD         -> ATAPI_COD
* IO         -> ATAPI_IO

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4829daacb342..7578ad48080f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -264,7 +264,7 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
         if (io_ports->ctl_addr) {
                 a = tp_ops->read_altstatus(hwif);
                 s = tp_ops->read_status(hwif);
-                if ((a ^ s) & ~INDEX_STAT)
+                if ((a ^ s) & ~ATA_IDX)
                         /* ancient Seagate drives, broken interfaces */
                         printk(KERN_INFO "%s: probing with STATUS(0x%02x) "
                                          "instead of ALTSTATUS(0x%02x)\n",
@@ -301,13 +301,13 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
                 msleep(50);
                 s = use_altstatus ? tp_ops->read_altstatus(hwif)
                                   : tp_ops->read_status(hwif);
-        } while (s & BUSY_STAT);
+        } while (s & ATA_BUSY);
 
-        /* wait for IRQ and DRQ_STAT */
+        /* wait for IRQ and ATA_DRQ */
         msleep(50);
         s = tp_ops->read_status(hwif);
 
-        if (OK_STAT(s, DRQ_STAT, BAD_R_STAT)) {
+        if (OK_STAT(s, ATA_DRQ, BAD_R_STAT)) {
                 unsigned long flags;
 
                 /* local CPU only; some systems need this */
@@ -391,7 +391,7 @@ static int ide_busy_sleep(ide_hwif_t *hwif)
         do {
                 msleep(50);
                 stat = hwif->tp_ops->read_status(hwif);
-                if ((stat & BUSY_STAT) == 0)
+                if ((stat & ATA_BUSY) == 0)
                         return 0;
         } while (time_before(jiffies, timeout));
 
@@ -460,7 +460,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                 if (drive->select.b.unit != 0) {
                         /* exit with drive0 selected */
                         SELECT_DRIVE(&hwif->drives[0]);
-                        /* allow BUSY_STAT to assert & clear */
+                        /* allow ATA_BUSY to assert & clear */
                         msleep(50);
                 }
                 /* no i/f present: mmm.. this should be a 4 -ml */
@@ -469,7 +469,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
 
         stat = tp_ops->read_status(hwif);
 
-        if (OK_STAT(stat, READY_STAT, BUSY_STAT) ||
+        if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) ||
             drive->present || cmd == ATA_CMD_ID_ATAPI) {
                 /* send cmd and wait */
                 if ((rc = try_to_identify(drive, cmd))) {
@@ -479,7 +479,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
 
                 stat = tp_ops->read_status(hwif);
 
-                if (stat == (BUSY_STAT | READY_STAT))
+                if (stat == (ATA_BUSY | ATA_DRDY))
                         return 4;
 
                 if (rc == 1 && cmd == ATA_CMD_ID_ATAPI) {