Skip to contentSkip to conversation

sbus/bpp: remove sleep_on() usage

PATCH New Nishanth Aravamudan 1 participant 1 message Jan 26, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 30/34 sbus/bpp: remove sleep_on() usage

Hi,

Please consider applying.

Description: Use wait-queue directly instead of the deprecated sleep_on() function. This required adding a local wait-queue.

drivers/sbus/char/bpp.c +5 -1
@@ -20,6 +20,7 @@
 #include <linux/timer.h>
 #include <linux/ioport.h>
 #include <linux/major.h>
+#include <linux/wait.h>
 #include <linux/devfs_fs_kernel.h>
 
 #include <asm/uaccess.h>
@@ -302,11 +303,14 @@ static void bpp_wake_up(unsigned long va
 
 static void snooze(unsigned long snooze_time, unsigned minor)
 {
+      DEFINE_WAIT(wait);
       init_timer(&instances[minor].timer_list);
       instances[minor].timer_list.expires = jiffies + snooze_time + 1;
       instances[minor].timer_list.data    = minor;
       add_timer(&instances[minor].timer_list);
-      sleep_on (&instances[minor].wait_queue);
+      prepare_to_wait(&instances[minor].wait_queue, &wait, TASK_UNINTERRUPTIBLE);
+      schedule();
+      finish_wait(&instances[minor].wait_queue, &wait);
 }
 
 static int wait_for(unsigned short set, unsigned short clr,

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors