aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Aravamudan <nacc@us.ibm.com>2005-09-12 17:16:17 -0400
committerDavid S. Miller <davem@davemloft.net>2005-09-12 17:16:17 -0400
commit074c5279ef671e4fcd2ce2960ecc9d7d9735fabd (patch)
treed0da7d1a20790fefea14c5f9cbc2f06e296050f8
parent7caaeabb17758295edff9703c18a840073c5b8f4 (diff)
[SPARC] drivers/sbus: fix-up schedule_timeout() usage
Use schedule_timeout_uninterruptible() instead of set_current_state()/schedule_timeout() to reduce kernel size. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/sbus/char/bpp.c3
-rw-r--r--drivers/sbus/char/vfc_i2c.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/sbus/char/bpp.c b/drivers/sbus/char/bpp.c
index 87302fb14885..ccb20a6f5f36 100644
--- a/drivers/sbus/char/bpp.c
+++ b/drivers/sbus/char/bpp.c
@@ -295,8 +295,7 @@ static unsigned short get_pins(unsigned minor)
295 295
296static void snooze(unsigned long snooze_time, unsigned minor) 296static void snooze(unsigned long snooze_time, unsigned minor)
297{ 297{
298 set_current_state(TASK_UNINTERRUPTIBLE); 298 schedule_timeout_uninterruptible(snooze_time + 1);
299 schedule_timeout(snooze_time + 1);
300} 299}
301 300
302static int wait_for(unsigned short set, unsigned short clr, 301static int wait_for(unsigned short set, unsigned short clr,
diff --git a/drivers/sbus/char/vfc_i2c.c b/drivers/sbus/char/vfc_i2c.c
index 739cad9b19a1..ceec30648f4f 100644
--- a/drivers/sbus/char/vfc_i2c.c
+++ b/drivers/sbus/char/vfc_i2c.c
@@ -81,8 +81,7 @@ int vfc_pcf8584_init(struct vfc_dev *dev)
81 81
82void vfc_i2c_delay_no_busy(struct vfc_dev *dev, unsigned long usecs) 82void vfc_i2c_delay_no_busy(struct vfc_dev *dev, unsigned long usecs)
83{ 83{
84 set_current_state(TASK_UNINTERRUPTIBLE); 84 schedule_timeout_uninterruptible(usecs_to_jiffies(usecs));
85 schedule_timeout(usecs_to_jiffies(usecs));
86} 85}
87 86
88void inline vfc_i2c_delay(struct vfc_dev *dev) 87void inline vfc_i2c_delay(struct vfc_dev *dev)