ide: kill DATA_READY define

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 17c2c04672972032b57f670b9568dec3174d88e7..c34836c02b14ac0fc74a4e369511d5aadf4e07e6 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -436,7 +436,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
        u8 stat = hwif->INB(IDE_STATUS_REG);
 
        /* new way for dealing with premature shared PCI interrupts */
-       if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) {
+       if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
                if (stat & (ERR_STAT | DRQ_STAT))
                        return task_error(drive, rq, __FUNCTION__, stat);
                /* No data yet, so wait for another IRQ. */
@@ -493,7 +493,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq)
 {
        ide_startstop_t startstop;
 
-       if (ide_wait_stat(&startstop, drive, DATA_READY,
+       if (ide_wait_stat(&startstop, drive, DRQ_STAT,
                          drive->bad_wstat, WAIT_DRQ)) {
                printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n",
                                drive->name,

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 6192564fcc5abff41a90c478d0c19d5eac5cb226..7615a6244a5100114c9eb3cf69d29ea81a6b83df 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -107,7 +107,6 @@ typedef unsigned char       byte;   /* used everywhere */
 #define BAD_W_STAT             (BAD_R_STAT  | WRERR_STAT)
 #define BAD_STAT               (BAD_R_STAT  | DRQ_STAT)
 #define DRIVE_READY            (READY_STAT  | SEEK_STAT)
-#define DATA_READY             (DRQ_STAT)
 
 #define BAD_CRC                        (ABRT_ERR    | ICRC_ERR)