From: domen@coderock.org Date: Mon, 20 Jun 2005 21:50:34 +0000 Subject: [patch 3/4] sbus/bpp: remove sleep_on() usage Message-Id: <20050620215034.503912000@nd47.coderock.org> List-Id: References: <20050306222904.42ED41F1F0@trashy.coderock.org> In-Reply-To: <20050306222904.42ED41F1F0@trashy.coderock.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: sparclinux@vger.kernel.org From: Nishanth Aravamudan Use wait-queue directly instead of the deprecated sleep_on() function. This required adding a local wait-queue. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer --- bpp.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) Index: quilt/drivers/sbus/char/bpp.c =================================--- quilt.orig/drivers/sbus/char/bpp.c +++ quilt/drivers/sbus/char/bpp.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -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, --