Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4906f3b4 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: kill DATA_READY define 



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 4d7a984b

drivers/ide/ide-taskfile.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

include/linux/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -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)