[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>

2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index 0b7d7412c4a5..466e9c2974bd 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -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();
 }
 /*==========================================================================*/
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 9f22e8f1f6c0..e65659926432 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -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? */