hamradio, ppp: change semaphore to completion

ppp and hamradio have copies of the same code that uses a semaphore
in place of a completion for historic reasons. Make it use the
proper interface instead in all copies.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 17e6dcd2eb4248c6378439194a283ad1f93f70c6..28c74998035946d42c5d3a9113df212be3316114 100644 (file)
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -120,7 +120,7 @@ struct sixpack {
        struct timer_list       tx_t;
        struct timer_list       resync_t;
        refcount_t              refcnt;
-       struct semaphore        dead_sem;
+       struct completion       dead;
        spinlock_t              lock;
 };
 
@@ -389,7 +389,7 @@ static struct sixpack *sp_get(struct tty_struct *tty)
 static void sp_put(struct sixpack *sp)
 {
        if (refcount_dec_and_test(&sp->refcnt))
-               up(&sp->dead_sem);
+               complete(&sp->dead);
 }
 
 /*
@@ -576,7 +576,7 @@ static int sixpack_open(struct tty_struct *tty)
 
        spin_lock_init(&sp->lock);
        refcount_set(&sp->refcnt, 1);
-       sema_init(&sp->dead_sem, 0);
+       init_completion(&sp->dead);
 
        /* !!! length of the buffers. MTU is IP MTU, not PACLEN!  */
 
@@ -670,10 +670,10 @@ static void sixpack_close(struct tty_struct *tty)
         * we have to wait for all existing users to finish.
         */
        if (!refcount_dec_and_test(&sp->refcnt))
-               down(&sp->dead_sem);
+               wait_for_completion(&sp->dead);
 
        /* We must stop the queue to avoid potentially scribbling
-        * on the free buffers. The sp->dead_sem is not sufficient
+        * on the free buffers. The sp->dead completion is not sufficient
         * to protect us from sp->xbuff access.
         */
        netif_stop_queue(sp->dev);

diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index 802233d41b25e8d167f61a825f529d5fc56b5881..4938cf4c184c67644686ce21a3d7138e682e72bc 100644 (file)
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -81,7 +81,7 @@ struct mkiss {
 #define CRC_MODE_SMACK_TEST    4
 
        atomic_t                refcnt;
-       struct semaphore        dead_sem;
+       struct completion       dead;
 };
 
 /*---------------------------------------------------------------------------*/
@@ -687,7 +687,7 @@ static struct mkiss *mkiss_get(struct tty_struct *tty)
 static void mkiss_put(struct mkiss *ax)
 {
        if (atomic_dec_and_test(&ax->refcnt))
-               up(&ax->dead_sem);
+               complete(&ax->dead);
 }
 
 static int crc_force = 0;      /* Can be overridden with insmod */
@@ -715,7 +715,7 @@ static int mkiss_open(struct tty_struct *tty)
 
        spin_lock_init(&ax->buflock);
        atomic_set(&ax->refcnt, 1);
-       sema_init(&ax->dead_sem, 0);
+       init_completion(&ax->dead);
 
        ax->tty = tty;
        tty->disc_data = ax;
@@ -795,7 +795,7 @@ static void mkiss_close(struct tty_struct *tty)
         * we have to wait for all existing users to finish.
         */
        if (!atomic_dec_and_test(&ax->refcnt))
-               down(&ax->dead_sem);
+               wait_for_completion(&ax->dead);
        /*
         * Halt the transmit queue so that a new transmit cannot scribble
         * on our buffers

diff --git a/drivers/net/ppp/ppp_async.c b/drivers/net/ppp/ppp_async.c
index bdc4d23627c54aee483158dab31ded6434df9da9..288cf099876b167ef990609976e5ce639bbe7c63 100644 (file)
--- a/drivers/net/ppp/ppp_async.c
+++ b/drivers/net/ppp/ppp_async.c
@@ -70,7 +70,7 @@ struct asyncppp {
        struct tasklet_struct tsk;
 
        refcount_t      refcnt;
-       struct semaphore dead_sem;
+       struct completion dead;
        struct ppp_channel chan;        /* interface to generic ppp layer */
        unsigned char   obuf[OBUFSIZE];
 };
@@ -148,7 +148,7 @@ static struct asyncppp *ap_get(struct tty_struct *tty)
 static void ap_put(struct asyncppp *ap)
 {
        if (refcount_dec_and_test(&ap->refcnt))
-               up(&ap->dead_sem);
+               complete(&ap->dead);
 }
 
 /*
@@ -186,7 +186,7 @@ ppp_asynctty_open(struct tty_struct *tty)
        tasklet_init(&ap->tsk, ppp_async_process, (unsigned long) ap);
 
        refcount_set(&ap->refcnt, 1);
-       sema_init(&ap->dead_sem, 0);
+       init_completion(&ap->dead);
 
        ap->chan.private = ap;
        ap->chan.ops = &async_ops;
@@ -235,7 +235,7 @@ ppp_asynctty_close(struct tty_struct *tty)
         * by the time it returns.
         */
        if (!refcount_dec_and_test(&ap->refcnt))
-               down(&ap->dead_sem);
+               wait_for_completion(&ap->dead);
        tasklet_kill(&ap->tsk);
 
        ppp_unregister_channel(&ap->chan);