Skip to contentSkip to conversation

atm/zatm: replace sleep_on() with

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

Subsystems (2)
Kernel janitors ATM
lore
Share & tools
lore

Nishanth Aravamudan

author
#0 lore raw

PATCH 2/40 atm/zatm: replace sleep_on() with

Quoted 16 lines · Nishanth Aravamudan

Hi,

Please consider applying.

Description: Use wait_event() instead of the deprecated sleep_on(). The first replacement is relatively non-controversial, as the message is only printed once, and still is. In the second, though, the message is printed every iteration of the loop. This functionality has been lost with wait_event(). Removed the unused variable once (which made sure that certain things were done on the first iteration of the loop, but not after; now there is only one "iteration"). Also fixed some strange tabbing.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/atm/zatm.c +0 -0

<snip>

drivers/atm/zatm.c

Quoted 2 lines
drivers/atm/zatm.c +2 -0
+	wait_event(zatm_vcc->tx_wait, !skb_peek(&zatm_vcc->backlog));
+	printk("waiting for TX queue to drain ... %p\n",skb);

This line results in a compile failure. Fixed (sort of) below...

Description: Use wait_event() instead of the deprecated sleep_on(). The first replacement is relatively non-controversial, as the message is only printed once, and still is. In the second, though, the message is printed every iteration of the loop. This functionality has been lost with wait_event(). Removed the unused variable once (which made sure that certain things were done on the first iteration of the loop, but not after; now there is only one "iteration"). Also fixed some strange tabbing. The final printk had to be modified as well, since it references a pointer which has not yet been assigned. Since the printk only happens once now (instead of repeatedly in a loop as before), I think this should be ok.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/atm/zatm.c +8 -20
@@ -22,6 +22,7 @@
 #include <linux/atm_zatm.h>
 #include <linux/capability.h>
 #include <linux/bitops.h>
+#include <linux/wait.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/string.h>

@@ -867,32 +868,19 @@ static void close_tx(struct atm_vcc *vcc
 	struct zatm_vcc *zatm_vcc;
 	unsigned long flags;
 	int chan;
-struct sk_buff *skb;
-int once = 1;
+	struct sk_buff *skb;
 
 	zatm_vcc = ZATM_VCC(vcc);
 	zatm_dev = ZATM_DEV(vcc->dev);
 	chan = zatm_vcc->tx_chan;
 	if (!chan) return;
 	DPRINTK("close_tx\n");
-	while (skb_peek(&zatm_vcc->backlog)) {
-if (once) {
-printk("waiting for backlog to drain ...\n");
-event_dump();
-once = 0;
-}
-		sleep_on(&zatm_vcc->tx_wait);
-	}
-once = 1;
-	while ((skb = skb_peek(&zatm_vcc->tx_queue))) {
-if (once) {
-printk("waiting for TX queue to drain ... %p\n",skb);
-event_dump();
-once = 0;
-}
-		DPRINTK("waiting for TX queue to drain ... %p\n",skb);
-		sleep_on(&zatm_vcc->tx_wait);
-	}
+	printk("waiting for backlog to drain ...\n");
+	event_dump();
+	wait_event(zatm_vcc->tx_wait, !skb_peek(&zatm_vcc->backlog));
+	printk("waiting for TX queue to drain ...\n");
+	event_dump();
+	wait_event(zatm_vcc->tx_wait, !(skb = skb_peek(&zatm_vcc->tx_queue)));
 	spin_lock_irqsave(&zatm_dev->lock, flags);
 #if 0
 	zwait;

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