[Kernel-janitors] sleep_on removal from drivers/net/shaper.c

[Kernel-janitors] sleep_on removal from drivers/net/shaper.c

[Domen Puncer]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

Hi.

Replaced sleep_on with wait_event.

Comments?


Signed-off-by: Domen Puncer <domen@coderock.org>

--- c/drivers/net/shaper.c	Wed Jun 16 07:19:43 2004
+++ a/drivers/net/shaper.c	Fri Jul 23 17:25:07 2004
@@ -112,7 +112,7 @@
 	while (test_and_set_bit(0, &sh->locked))
 	{
 		if (!in_interrupt())
-			sleep_on(&sh->wait_queue);
+			wait_event(sh->wait_queue, 0);
 		else
 			return 0;
 			

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[Kernel-janitors] sleep_on removal from tokenring/tms389tr.c

[Domen Puncer]

[-- Attachment #1: Type: text/plain, Size: 888 bytes --]

Hi.

Replaced sleep_on_interruptible with wait_event_interruptible.
wait_event_interruptible condition is 0, but since it's a define it
compiles to nothing.

Compile tested.


Signed-off-by: Domen Puncer <domen@coderock.org>

--- c/drivers/net/tokenring/tms380tr.c	Fri Jul 23 16:00:23 2004
+++ a/drivers/net/tokenring/tms380tr.c	Fri Jul 23 17:11:05 2004
@@ -288,7 +288,7 @@
 	 * there will be a timeout from the timer.
 	 */
 	tp->Sleeping = 1;
-	interruptible_sleep_on(&tp->wait_for_tok_int);
+	wait_event_interruptible(tp->wait_for_tok_int, 0);
 	del_timer(&tp->timer);
 
 	/* If AdapterVirtOpenFlag is 1, the adapter is now open for use */
@@ -1145,7 +1145,7 @@
 	tms380tr_enable_interrupts(dev);
 
 	tp->Sleeping = 1;
-	interruptible_sleep_on(&tp->wait_for_tok_int);
+	wait_event_interruptible(tp->wait_for_tok_int, 0);
 	tp->TransmitCommandActive = 0;
     
 	del_timer(&tp->timer);

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors