diff options
author | Nishanth Aravamudan <nacc@us.ibm.com> | 2005-11-07 04:01:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:57 -0500 |
commit | 8b93ec77a6423cc57189561567ee41fa7fa1f5b6 (patch) | |
tree | de91b3ab250edaa7b1315b463a4b45d49c099568 | |
parent | 66c006a55137cc51f8761549e2024a7593180d27 (diff) |
[PATCH] drivers/media: fix-up schedule_timeout() usage
Use schedule_timeout_interruptible() instead of
set_current_state()/schedule_timeout() to reduce kernel size.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/video/msp3400.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-tvaudio.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index 262890cb20a7..e75e7948fd9d 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c | |||
@@ -741,8 +741,8 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout) | |||
741 | set_current_state(TASK_INTERRUPTIBLE); | 741 | set_current_state(TASK_INTERRUPTIBLE); |
742 | schedule(); | 742 | schedule(); |
743 | } else { | 743 | } else { |
744 | set_current_state(TASK_INTERRUPTIBLE); | 744 | schedule_timeout_interruptible |
745 | schedule_timeout(msecs_to_jiffies(timeout)); | 745 | (msecs_to_jiffies(timeout)); |
746 | } | 746 | } |
747 | } | 747 | } |
748 | 748 | ||
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c index badf2f9e3072..61a2d6b50eef 100644 --- a/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/drivers/media/video/saa7134/saa7134-tvaudio.c | |||
@@ -342,8 +342,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout) | |||
342 | set_current_state(TASK_INTERRUPTIBLE); | 342 | set_current_state(TASK_INTERRUPTIBLE); |
343 | schedule(); | 343 | schedule(); |
344 | } else { | 344 | } else { |
345 | set_current_state(TASK_INTERRUPTIBLE); | 345 | schedule_timeout_interruptible |
346 | schedule_timeout(msecs_to_jiffies(timeout)); | 346 | (msecs_to_jiffies(timeout)); |
347 | } | 347 | } |
348 | } | 348 | } |
349 | remove_wait_queue(&dev->thread.wq, &wait); | 349 | remove_wait_queue(&dev->thread.wq, &wait); |