1 files changed, 13 insertions, 12 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index ce9ecd138836..8dd7b46b41b7 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -322,7 +322,7 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                 ide_task_t *task = (ide_task_t *)rq->special;
 
                 if (rq->errors == 0)
-                        rq->errors = !OK_STAT(stat, READY_STAT, BAD_STAT);
+                        rq->errors = !OK_STAT(stat, ATA_DRDY, BAD_STAT);
 
                 if (task) {
                         struct ide_taskfile *tf = &task->tf;
@@ -373,12 +373,12 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
 {
         ide_hwif_t *hwif = drive->hwif;
 
-        if (stat & BUSY_STAT || ((stat & WRERR_STAT) && !drive->nowerr)) {
+        if ((stat & ATA_BUSY) || ((stat & ATA_DF) && !drive->nowerr)) {
                 /* other bits are useless when BUSY */
                 rq->errors |= ERROR_RESET;
-        } else if (stat & ERR_STAT) {
+        } else if (stat & ATA_ERR) {
                 /* err has different meaning on cdrom and tape */
-                if (err == ABRT_ERR) {
+                if (err == ATA_ABORTED) {
                         if (drive->select.b.lba &&
                             /* some newer drives don't support ATA_CMD_INIT_DEV_PARAMS */
                             hwif->tp_ops->read_status(hwif) == ATA_CMD_INIT_DEV_PARAMS)
@@ -386,16 +386,16 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
                 } else if ((err & BAD_CRC) == BAD_CRC) {
                         /* UDMA crc error, just retry the operation */
                         drive->crc_count++;
-                } else if (err & (BBD_ERR | ECC_ERR)) {
+                } else if (err & (ATA_BBK | ATA_UNC)) {
                         /* retries won't help these */
                         rq->errors = ERROR_MAX;
-                } else if (err & TRK0_ERR) {
+                } else if (err & ATA_TRK0NF) {
                         /* help it find track zero */
                         rq->errors |= ERROR_RECAL;
                 }
         }
 
-        if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ &&
+        if ((stat & ATA_DRQ) && rq_data_dir(rq) == READ &&
             (hwif->host_flags & IDE_HFLAG_ERROR_STOPS_FIFO) == 0) {
                 int nsect = drive->mult_count ? drive->mult_count : 1;
 
@@ -407,7 +407,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8
                 return ide_stopped;
         }
 
-        if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
+        if (hwif->tp_ops->read_status(hwif) & (ATA_BUSY | ATA_DRQ))
                 rq->errors |= ERROR_RESET;
 
         if ((rq->errors & ERROR_RESET) == ERROR_RESET) {
@@ -427,14 +427,14 @@ static ide_startstop_t ide_atapi_error(ide_drive_t *drive, struct request *rq, u
 {
         ide_hwif_t *hwif = drive->hwif;
 
-        if (stat & BUSY_STAT || ((stat & WRERR_STAT) && !drive->nowerr)) {
+        if ((stat & ATA_BUSY) || ((stat & ATA_DF) && !drive->nowerr)) {
                 /* other bits are useless when BUSY */
                 rq->errors |= ERROR_RESET;
         } else {
                 /* add decoding error stuff */
         }
 
-        if (hwif->tp_ops->read_status(hwif) & (BUSY_STAT | DRQ_STAT))
+        if (hwif->tp_ops->read_status(hwif) & (ATA_BUSY | ATA_DRQ))
                 /* force an abort */
                 hwif->tp_ops->exec_command(hwif, ATA_CMD_IDLEIMMEDIATE);
 
@@ -804,7 +804,8 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
                 ide_check_pm_state(drive, rq);
 
         SELECT_DRIVE(drive);
-        if (ide_wait_stat(&startstop, drive, drive->ready_stat, BUSY_STAT|DRQ_STAT, WAIT_READY)) {
+        if (ide_wait_stat(&startstop, drive, drive->ready_stat,
+                          ATA_BUSY | ATA_DRQ, WAIT_READY)) {
                 printk(KERN_ERR "%s: drive not ready for command\n", drive->name);
                 return startstop;
         }
@@ -1324,7 +1325,7 @@ static void unexpected_intr (int irq, ide_hwgroup_t *hwgroup)
                 if (hwif->irq == irq) {
                         stat = hwif->tp_ops->read_status(hwif);
 
-                        if (!OK_STAT(stat, READY_STAT, BAD_STAT)) {
+                        if (!OK_STAT(stat, ATA_DRDY, BAD_STAT)) {
                                 /* Try to not flood the console with msgs */
                                 static unsigned long last_msgtime, count;
                                 ++count;