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

Commit 08cd1dca authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: cleanup ide_do_request() 



Both choose_drive() and PM handling code make sure that the queue
is unplugged so no need to check it again.

Cc: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2a2ca6a9

drivers/ide/ide-io.c

+0 −5
Original line number Diff line number Diff line
@@ -1016,11 +1016,6 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) 
		drive->dev_flags &= ~(IDE_DFLAG_SLEEPING | IDE_DFLAG_PARKED);

		drive->service_start = jiffies;



		if (blk_queue_plugged(drive->queue)) {

			printk(KERN_ERR "ide: huh? queue was plugged!\n");

			break;

		}



		/*

		 * we know that the queue isn't empty, but this can happen

		 * if the q->prep_rq_fn() decides to kill a request