diff options
| author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2007-12-14 01:03:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-29 00:07:20 +0100 |
| commit | 01f31ac8289200e1cab4d100ce991cebe5731360 (patch) | |
| tree | 7fb3245d3e4797cf1f622836166c266328fa7197 /drivers/net/plip.c | |
| parent | bnx2x depends on ZLIB_INFLATE (diff) | |
| download | linux-01f31ac8289200e1cab4d100ce991cebe5731360.tar.xz linux-01f31ac8289200e1cab4d100ce991cebe5731360.zip | |
PLIP driver: convert the semaphore killed_timer_sem to completion
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>
Diffstat (limited to 'drivers/net/plip.c')
| -rw-r--r-- | drivers/net/plip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 57c98669984d..fee3d7b1feba 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c @@ -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/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 version 2.4-parport gniibe@mri.co.jp\n" #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 |