aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-taskfile.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:11 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:11 -0500
commit4906f3b4cddc3e4d62955ed386598561f95602c0 (patch)
treefcf2ef00e2d6625ae521a83d101a3c7a92ae5c6a /drivers/ide/ide-taskfile.c
parent4d7a984bdcbdda69fc6b2a4a655415140270aa7b (diff)
ide: kill DATA_READY define
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-taskfile.c')
-rw-r--r--drivers/ide/ide-taskfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 17c2c0467297..c34836c02b14 100644
--- 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)
436 u8 stat = hwif->INB(IDE_STATUS_REG); 436 u8 stat = hwif->INB(IDE_STATUS_REG);
437 437
438 /* new way for dealing with premature shared PCI interrupts */ 438 /* new way for dealing with premature shared PCI interrupts */
439 if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) { 439 if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
440 if (stat & (ERR_STAT | DRQ_STAT)) 440 if (stat & (ERR_STAT | DRQ_STAT))
441 return task_error(drive, rq, __FUNCTION__, stat); 441 return task_error(drive, rq, __FUNCTION__, stat);
442 /* No data yet, so wait for another IRQ. */ 442 /* 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)
493{ 493{
494 ide_startstop_t startstop; 494 ide_startstop_t startstop;
495 495
496 if (ide_wait_stat(&startstop, drive, DATA_READY, 496 if (ide_wait_stat(&startstop, drive, DRQ_STAT,
497 drive->bad_wstat, WAIT_DRQ)) { 497 drive->bad_wstat, WAIT_DRQ)) {
498 printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n", 498 printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n",
499 drive->name, 499 drive->name,