[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: Nishanth Aravamudan <[email protected]>
Cc: Jens Axboe <[email protected]>
Signed-off-by: Adrian Bunk <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Nishanth Aravamudan 2005-09-10 00:27:29 -07:00 • committed by Linus Torvalds
commit 2ddee1b7a7
2 changed files with 2 additions and 4 deletions

View file

@ -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();
}
/*==========================================================================*/

View file

@ -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? */