Skip to content

Commit

Permalink
[PPP] synchronous tty: convert dead_sem to completion
Browse files Browse the repository at this point in the history
PPP synchronous tty channel driver: convert the semaphore dead_sem to a
completion

Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Matthias Kaehlcke authored and David S. Miller committed Jan 28, 2008
1 parent 9055e05 commit 5e41fb8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ppp_synctty.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
#include <linux/if_ppp.h>
#include <linux/ppp_channel.h>
#include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/init.h>
#include <asm/uaccess.h>
#include <asm/semaphore.h>

#define PPP_VERSION "2.4.2"

Expand All @@ -70,7 +70,7 @@ struct syncppp {
struct tasklet_struct tsk;

atomic_t refcnt;
struct semaphore dead_sem;
struct completion dead_cmp;
struct ppp_channel chan; /* interface to generic ppp layer */
};

Expand Down Expand Up @@ -195,7 +195,7 @@ static struct syncppp *sp_get(struct tty_struct *tty)
static void sp_put(struct syncppp *ap)
{
if (atomic_dec_and_test(&ap->refcnt))
up(&ap->dead_sem);
complete(&ap->dead_cmp);
}

/*
Expand Down Expand Up @@ -225,7 +225,7 @@ ppp_sync_open(struct tty_struct *tty)
tasklet_init(&ap->tsk, ppp_sync_process, (unsigned long) ap);

atomic_set(&ap->refcnt, 1);
init_MUTEX_LOCKED(&ap->dead_sem);
init_completion(&ap->dead_cmp);

ap->chan.private = ap;
ap->chan.ops = &sync_ops;
Expand Down Expand Up @@ -273,7 +273,7 @@ ppp_sync_close(struct tty_struct *tty)
* by the time it returns.
*/
if (!atomic_dec_and_test(&ap->refcnt))
down(&ap->dead_sem);
wait_for_completion(&ap->dead_cmp);
tasklet_kill(&ap->tsk);

ppp_unregister_channel(&ap->chan);
Expand Down

0 comments on commit 5e41fb8

Please sign in to comment.