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

Commit b2cfb05a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove "paranoia" checks for hwgroup->busy 



Remove "paranoia" checks for hwgroup->busy from ide_timer_expiry()
and ide_intr().  This is a preparation for future changes.

Cc: Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Elias Oltmanns <eo@nebensachen.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2fb21150

drivers/ide/ide-io.c

+1 −8
Original line number Diff line number Diff line
@@ -1011,10 +1011,7 @@ void ide_timer_expiry (unsigned long data) 
		} else {

			ide_hwif_t *hwif;

			ide_startstop_t startstop = ide_stopped;

			if (!hwgroup->busy) {

				hwgroup->busy = 1;	/* paranoia */

				printk(KERN_ERR "%s: ide_timer_expiry: hwgroup->busy was 0 ??\n", drive->name);

			}



			if ((expiry = hwgroup->expiry) != NULL) {

				/* continue */

				if ((wait = expiry(drive)) > 0) {
@@ -1227,10 +1224,6 @@ irqreturn_t ide_intr (int irq, void *dev_id) 
		 */

		goto out;



	if (!hwgroup->busy) {

		hwgroup->busy = 1;	/* paranoia */

		printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name);

	}

	hwgroup->handler = NULL;

	hwgroup->req_gen++;

	del_timer(&hwgroup->timer);