UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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 <nacc@us.ibm.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Nishanth Aravamudan 2005-09-10 00:27:29 -07:00 committed by Linus Torvalds
parent 86e8486245
commit 2ddee1b7a7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cdrom/sbpcd.c
View File

@ -827,8 +827,7 @@ static void mark_timeout_audio(u_long i)
static void sbp_sleep(u_int time) static void sbp_sleep(u_int time)
{ {
sti(); sti();
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(time);
schedule_timeout(time);
sti(); sti();
} }
/*==========================================================================*/ /*==========================================================================*/

3
drivers/cdrom/sonycd535.c
View File

@ -1478,8 +1478,7 @@ static int __init sony535_init(void)
/* look for the CD-ROM, follows the procedure in the DOS driver */ /* look for the CD-ROM, follows the procedure in the DOS driver */
inb(select_unit_reg); inb(select_unit_reg);
/* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */ /* wait for 40 18 Hz ticks (reverse-engineered from DOS driver) */
set_current_state(TASK_INTERRUPTIBLE); schedule_timeout_interruptible((HZ+17)*40/18);
schedule_timeout((HZ+17)*40/18);
inb(result_reg); inb(result_reg);
outb(0, read_status_reg); /* does a reset? */ outb(0, read_status_reg); /* does a reset? */