Darkangeel_hd
/
lineage_android_kernel_samsung_jf
mirror of https://github.com/Darkangeel-hd/lineage_android_kernel_samsung_jf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[PPP] synchronous tty: convert dead_sem to completion 

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>
This commit is contained in:
Matthias Kaehlcke 2007-12-14 11:32:48 -08:00 committed by David S. Miller
parent 9055e051b8
commit 5e41fb8321
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ppp_synctty.c
View File

@ -42,9 +42,9 @@
#include <linux/if_ppp.h> #include <linux/if_ppp.h>
#include <linux/ppp_channel.h> #include <linux/ppp_channel.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/completion.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/semaphore.h>
#define PPP_VERSION "2.4.2" #define PPP_VERSION "2.4.2"
@ -70,7 +70,7 @@ struct syncppp {
struct tasklet_struct tsk; struct tasklet_struct tsk;
atomic_t refcnt; atomic_t refcnt;
struct semaphore dead_sem; struct completion dead_cmp;
struct ppp_channel chan; /* interface to generic ppp layer */ struct ppp_channel chan; /* interface to generic ppp layer */
}; };
@ -195,7 +195,7 @@ static struct syncppp *sp_get(struct tty_struct *tty)
static void sp_put(struct syncppp *ap) static void sp_put(struct syncppp *ap)
{ {
if (atomic_dec_and_test(&ap->refcnt)) if (atomic_dec_and_test(&ap->refcnt))
up(&ap->dead_sem); complete(&ap->dead_cmp);
} }
/* /*
@ -225,7 +225,7 @@ ppp_sync_open(struct tty_struct *tty)
tasklet_init(&ap->tsk, ppp_sync_process, (unsigned long) ap); tasklet_init(&ap->tsk, ppp_sync_process, (unsigned long) ap);
atomic_set(&ap->refcnt, 1); atomic_set(&ap->refcnt, 1);
init_MUTEX_LOCKED(&ap->dead_sem); init_completion(&ap->dead_cmp);
ap->chan.private = ap; ap->chan.private = ap;
ap->chan.ops = &sync_ops; ap->chan.ops = &sync_ops;
@ -273,7 +273,7 @@ ppp_sync_close(struct tty_struct *tty)
* by the time it returns. * by the time it returns.
*/ */
if (!atomic_dec_and_test(&ap->refcnt)) if (!atomic_dec_and_test(&ap->refcnt))
down(&ap->dead_sem); wait_for_completion(&ap->dead_cmp);
tasklet_kill(&ap->tsk); tasklet_kill(&ap->tsk);
ppp_unregister_channel(&ap->chan); ppp_unregister_channel(&ap->chan);