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

Commit 629f944b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: use __ide_set_handler() in ide_execute_command() 



* Use __ide_set_handler() in ide_execute_command().

While at it:

* Fix whitespace damage in ide_execute_command().

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

drivers/ide/ide-iops.c

+8 −13
Original line number Diff line number Diff line
@@ -884,19 +884,14 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler, 
	ide_hwif_t *hwif = HWIF(drive);



	spin_lock_irqsave(&ide_lock, flags);

	

	BUG_ON(hwgroup->handler);

	hwgroup->handler	= handler;

	hwgroup->expiry		= expiry;

	hwgroup->timer.expires	= jiffies + timeout;

	hwgroup->req_gen_timer = hwgroup->req_gen;

	add_timer(&hwgroup->timer);

	__ide_set_handler(drive, handler, timeout, expiry);

	hwif->OUTBSYNC(drive, cmd, IDE_COMMAND_REG);

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

	   serviced before that. 

	   

	   FIXME: we could skip this delay with care on non shared

	   devices 

	/*

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

	 * serviced before that.

	 *

	 * FIXME: we could skip this delay with care on non shared devices

	 */

	ndelay(400);

	spin_unlock_irqrestore(&ide_lock, flags);