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

Commit 60c0cd02 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: set hwif->expiry prior to calling [__]ide_set_handler() 



* Set hwif->expiry prior to calling [__]ide_set_handler()
  and drop 'expiry' argument.

* Set hwif->expiry to NULL in ide_{timer_expiry,intr}()
  and remove 'hwif->expiry = NULL' assignments.

There should be no functional changes caused by this patch.

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

drivers/ide/ide-atapi.c

+4 −2
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive) 
		  rq->cmd[0], bcount);

next_irq:

	/* And set the interrupt handler again */

	ide_set_handler(drive, ide_pc_intr, timeout, NULL);

	ide_set_handler(drive, ide_pc_intr, timeout);

	return ide_started;

}
@@ -602,11 +602,13 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
		}

	}



	hwif->expiry = expiry;



	/* Set the interrupt routine */

	ide_set_handler(drive,

			(dev_is_idecd(drive) ? drive->irq_handler

					     : ide_pc_intr),

			timeout, expiry);

			timeout);



	/* Begin DMA, if necessary */

	if (dev_is_idecd(drive)) {

drivers/ide/ide-cd.c

+2 −1
Original line number Diff line number Diff line
@@ -959,7 +959,8 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) 
			expiry = ide_cd_expiry;

	}



	ide_set_handler(drive, cdrom_newpc_intr, timeout, expiry);

	hwif->expiry = expiry;

	ide_set_handler(drive, cdrom_newpc_intr, timeout);

	return ide_started;



end_request:

drivers/ide/ide-eh.c

+4 −5
Original line number Diff line number Diff line
@@ -175,8 +175,7 @@ static ide_startstop_t atapi_reset_pollfunc(ide_drive_t *drive) 
		printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);

	else {

		if (time_before(jiffies, hwif->poll_timeout)) {

			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20,

					NULL);

			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20);

			/* continue polling */

			return ide_started;

		}
@@ -238,7 +237,7 @@ static ide_startstop_t reset_pollfunc(ide_drive_t *drive) 


	if (!OK_STAT(tmp, 0, ATA_BUSY)) {

		if (time_before(jiffies, hwif->poll_timeout)) {

			ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL);

			ide_set_handler(drive, &reset_pollfunc, HZ/20);

			/* continue polling */

			return ide_started;

		}
@@ -355,7 +354,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi) 
		ndelay(400);

		hwif->poll_timeout = jiffies + WAIT_WORSTCASE;

		hwif->polling = 1;

		__ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);

		__ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20);

		spin_unlock_irqrestore(&hwif->lock, flags);

		return ide_started;

	}
@@ -415,7 +414,7 @@ static ide_startstop_t do_reset1(ide_drive_t *drive, int do_not_try_atapi) 
	udelay(10);

	hwif->poll_timeout = jiffies + WAIT_WORSTCASE;

	hwif->polling = 1;

	__ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL);

	__ide_set_handler(drive, &reset_pollfunc, HZ/20);



	/*

	 * Some weird controller like resetting themselves to a strange

drivers/ide/ide-io.c

+2 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ void ide_timer_expiry (unsigned long data) 
			}

		}

		hwif->handler = NULL;

		hwif->expiry = NULL;

		/*

		 * We need to simulate a real interrupt when invoking

		 * the handler() function, which means we need to
@@ -830,6 +831,7 @@ irqreturn_t ide_intr (int irq, void *dev_id) 
		goto out;



	hwif->handler = NULL;

	hwif->expiry = NULL;

	hwif->req_gen++;

	del_timer(&hwif->timer);

	spin_unlock(&hwif->lock);

drivers/ide/ide-iops.c

+7 −6
Original line number Diff line number Diff line
@@ -425,26 +425,25 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) 
 * See also ide_execute_command

 */

void __ide_set_handler(ide_drive_t *drive, ide_handler_t *handler,

		       unsigned int timeout, ide_expiry_t *expiry)

		       unsigned int timeout)

{

	ide_hwif_t *hwif = drive->hwif;



	BUG_ON(hwif->handler);

	hwif->handler		= handler;

	hwif->expiry		= expiry;

	hwif->timer.expires	= jiffies + timeout;

	hwif->req_gen_timer	= hwif->req_gen;

	add_timer(&hwif->timer);

}



void ide_set_handler(ide_drive_t *drive, ide_handler_t *handler,

		      unsigned int timeout, ide_expiry_t *expiry)

		     unsigned int timeout)

{

	ide_hwif_t *hwif = drive->hwif;

	unsigned long flags;



	spin_lock_irqsave(&hwif->lock, flags);

	__ide_set_handler(drive, handler, timeout, expiry);

	__ide_set_handler(drive, handler, timeout);

	spin_unlock_irqrestore(&hwif->lock, flags);

}

EXPORT_SYMBOL(ide_set_handler);
@@ -469,8 +468,10 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler, 
	ide_hwif_t *hwif = drive->hwif;

	unsigned long flags;



	hwif->expiry = expiry;



	spin_lock_irqsave(&hwif->lock, flags);

	__ide_set_handler(drive, handler, timeout, expiry);

	__ide_set_handler(drive, handler, timeout);

	hwif->tp_ops->exec_command(hwif, cmd);

	/*

	 * Drive takes 400nS to respond, we must avoid the IRQ being