Skip to contentSkip to conversation

ide: kill DATA_READY define

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Dec 9, 2007 – Dec 10, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 11/20 ide: kill DATA_READY define

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-taskfile.c |    4 ++--
 include/linux/ide.h        |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/ide/ide-taskfile.c +2 -2
Index: b/drivers/ide/ide-taskfile.c
===================================================================
@@ -436,7 +436,7 @@ static ide_startstop_t task_in_intr(ide_
 	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_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,
include/linux/ide.h +0 -1
Index: b/include/linux/ide.h
===================================================================
@@ -107,7 +107,6 @@ typedef unsigned char	byte;	/* used ever
 #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)