Skip to contentSkip to conversation

PLIP driver: convert killed_timer_sem to completion

PATCH Applied [email protected] 2 participants 2 messages Dec 14, 2007 – Dec 18, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 10/10 PLIP driver: convert killed_timer_sem to completion

From: Matthias Kaehlcke <[email protected]>

PLIP driver: convert the semaphore killed_timer_sem to a completion

Signed-off-by Matthias Kaehlcke <[email protected]>
Cc Jeff Garzik <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 drivers/net/plip.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/plip.c renamed from drivers/net/plip.c~plip-driver-convert-killed_timer_sem-to-completion +5 -5
diff -puN drivers/net/plip.c~plip-driver-convert-killed_timer_sem-to-completion drivers/net/plip.c
@@ -106,6 +106,7 @@ static const char version[] = "NET3 PLIP
 #include <linux/if_plip.h>
 #include <linux/workqueue.h>
 #include <linux/spinlock.h>
+#include <linux/completion.h>
 #include <linux/parport.h>
 #include <linux/bitops.h>
 

@@ -114,7 +115,6 @@ static const char version[] = "NET3 PLIP
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/byteorder.h>
-#include <asm/semaphore.h>
 
 /* Maximum number of devices to support. */
 #define PLIP_MAX  8

@@ -221,7 +221,7 @@ struct net_local {
 	int should_relinquish;
 	spinlock_t lock;
 	atomic_t kill_timer;
-	struct semaphore killed_timer_sem;
+	struct completion killed_timer_cmp;
 };
 
 static inline void enable_parport_interrupts (struct net_device *dev)

@@ -385,7 +385,7 @@ plip_timer_bh(struct work_struct *work)
 		schedule_delayed_work(&nl->timer, 1);
 	}
 	else {
-		up (&nl->killed_timer_sem);
+		complete(&nl->killed_timer_cmp);
 	}
 }
 

@@ -1112,9 +1112,9 @@ plip_close(struct net_device *dev)
 
 	if (dev->irq == -1)
 	{
-		init_MUTEX_LOCKED (&nl->killed_timer_sem);
+		init_completion(&nl->killed_timer_cmp);
 		atomic_set (&nl->kill_timer, 1);
-		down (&nl->killed_timer_sem);
+		wait_for_completion(&nl->killed_timer_cmp);
 	}
 
 #ifdef NOTDEF

_