lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PLIP driver: convert the semaphore killed_timer_sem to completion

Browse Source 
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Matthias Kaehlcke
2007-12-13 16:03:00 -08:00
committed by David S. Miller
parent 07b270eab5
commit 01f31ac828
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/plip.c
View File

@@ -106,6 +106,7 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n"
#include <linux/if_plip.h> #include <linux/if_plip.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/bitops.h> #include <linux/bitops.h>
@@ -114,7 +115,6 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n"
#include <asm/system.h> #include <asm/system.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/semaphore.h>
/* Maximum number of devices to support. */ /* Maximum number of devices to support. */
#define PLIP_MAX 8 #define PLIP_MAX 8
@@ -221,7 +221,7 @@ struct net_local {
int should_relinquish; int should_relinquish;
spinlock_t lock; spinlock_t lock;
atomic_t kill_timer; atomic_t kill_timer;
struct semaphore killed_timer_sem; struct completion killed_timer_cmp;
}; };
static inline void enable_parport_interrupts (struct net_device *dev) 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); schedule_delayed_work(&nl->timer, 1);
} }
else { 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) if (dev->irq == -1)
{ {
init_MUTEX_LOCKED (&nl->killed_timer_sem); init_completion(&nl->killed_timer_cmp);
atomic_set (&nl->kill_timer, 1); atomic_set (&nl->kill_timer, 1);
down (&nl->killed_timer_sem); wait_for_completion(&nl->killed_timer_cmp);
} }
#ifdef NOTDEF #ifdef NOTDEF