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

Commit 2ddee1b7 authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds
Browse files

[PATCH] drivers/cdrom: fix-up schedule_timeout() usage 



Use schedule_timeout_{un,}interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.

Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 86e84862

drivers/cdrom/sbpcd.c

+1 −2
Original line number Diff line number Diff line
@@ -827,8 +827,7 @@ static void mark_timeout_audio(u_long i) 
static void sbp_sleep(u_int time)

{

	sti();

	current->state = TASK_INTERRUPTIBLE;

	schedule_timeout(time);

	schedule_timeout_interruptible(time);

	sti();

}

/*==========================================================================*/

drivers/cdrom/sonycd535.c

+1 −2
Original line number Diff line number Diff line
@@ -1478,8 +1478,7 @@ static int __init sony535_init(void) 
	/* look for the CD-ROM, follows the procedure in the DOS driver */

	inb(select_unit_reg);

	/* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */

	set_current_state(TASK_INTERRUPTIBLE);

	schedule_timeout((HZ+17)*40/18);

	schedule_timeout_interruptible((HZ+17)*40/18);

	inb(result_reg);



	outb(0, read_status_reg);	/* does a reset? */