summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/sonycd535.c
diff options
context:
space:
mode:
authorNishanth Aravamudan2005-09-10 09:27:29 +0200
committerLinus Torvalds2005-09-10 19:06:38 +0200
commit2ddee1b7a732dc96d479afaa7d0a26aa53990089 (patch)
tree9db14954d26c587956b1f83fc6c7bb564b11b42b /drivers/cdrom/sonycd535.c
parent[PATCH] drivers/block: fix-up schedule_timeout() usage (diff)
downloadkernel-qcow2-linux-2ddee1b7a732dc96d479afaa7d0a26aa53990089.tar.gz
kernel-qcow2-linux-2ddee1b7a732dc96d479afaa7d0a26aa53990089.tar.xz
kernel-qcow2-linux-2ddee1b7a732dc96d479afaa7d0a26aa53990089.zip
[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>
Diffstat (limited to 'drivers/cdrom/sonycd535.c')
-rw-r--r--drivers/cdrom/sonycd535.c3
1 files changed, 1 insertions, 2 deletions
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? */