leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hamradio, ppp: change semaphore to completion

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2018-12-10 22:52:56 +01:00
committed by David S. Miller
parent 2aa55dccf8
commit c2c79a32fb
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/hamradio/6pack.c
View File

@@ -120,7 +120,7 @@ struct sixpack {
struct timer_list tx_t; struct timer_list tx_t;
struct timer_list resync_t; struct timer_list resync_t;
refcount_t refcnt; refcount_t refcnt;
struct semaphore dead_sem; struct completion dead;
spinlock_t lock; spinlock_t lock;
}; };
@@ -389,7 +389,7 @@ static struct sixpack *sp_get(struct tty_struct *tty)
static void sp_put(struct sixpack *sp) static void sp_put(struct sixpack *sp)
{ {
if (refcount_dec_and_test(&sp->refcnt)) 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); spin_lock_init(&sp->lock);
refcount_set(&sp->refcnt, 1); 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! */ /* !!! 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. * we have to wait for all existing users to finish.
*/ */
if (!refcount_dec_and_test(&sp->refcnt)) 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 /* 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. * to protect us from sp->xbuff access.
*/ */
netif_stop_queue(sp->dev); netif_stop_queue(sp->dev);

8
drivers/net/hamradio/mkiss.c
View File

@@ -81,7 +81,7 @@ struct mkiss {
#define CRC_MODE_SMACK_TEST 4 #define CRC_MODE_SMACK_TEST 4
atomic_t refcnt; 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) static void mkiss_put(struct mkiss *ax)
{ {
if (atomic_dec_and_test(&ax->refcnt)) if (atomic_dec_and_test(&ax->refcnt))
up(&ax->dead_sem); complete(&ax->dead);
} }
static int crc_force = 0; /* Can be overridden with insmod */ 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); spin_lock_init(&ax->buflock);
atomic_set(&ax->refcnt, 1); atomic_set(&ax->refcnt, 1);
sema_init(&ax->dead_sem, 0); init_completion(&ax->dead);
ax->tty = tty; ax->tty = tty;
tty->disc_data = ax; 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. * we have to wait for all existing users to finish.
*/ */
if (!atomic_dec_and_test(&ax->refcnt)) 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 * Halt the transmit queue so that a new transmit cannot scribble
* on our buffers * on our buffers

8
drivers/net/ppp/ppp_async.c
View File

@@ -70,7 +70,7 @@ struct asyncppp {
struct tasklet_struct tsk; struct tasklet_struct tsk;
refcount_t refcnt; refcount_t refcnt;
struct semaphore dead_sem; struct completion dead;
struct ppp_channel chan; /* interface to generic ppp layer */ struct ppp_channel chan; /* interface to generic ppp layer */
unsigned char obuf[OBUFSIZE]; unsigned char obuf[OBUFSIZE];
}; };
@@ -148,7 +148,7 @@ static struct asyncppp *ap_get(struct tty_struct *tty)
static void ap_put(struct asyncppp *ap) static void ap_put(struct asyncppp *ap)
{ {
if (refcount_dec_and_test(&ap->refcnt)) 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); tasklet_init(&ap->tsk, ppp_async_process, (unsigned long) ap);
refcount_set(&ap->refcnt, 1); refcount_set(&ap->refcnt, 1);
sema_init(&ap->dead_sem, 0); init_completion(&ap->dead);
ap->chan.private = ap; ap->chan.private = ap;
ap->chan.ops = &async_ops; ap->chan.ops = &async_ops;
@@ -235,7 +235,7 @@ ppp_asynctty_close(struct tty_struct *tty)
* by the time it returns. * by the time it returns.
*/ */
if (!refcount_dec_and_test(&ap->refcnt)) if (!refcount_dec_and_test(&ap->refcnt))
down(&ap->dead_sem); wait_for_completion(&ap->dead);
tasklet_kill(&ap->tsk); tasklet_kill(&ap->tsk);
ppp_unregister_channel(&ap->chan); ppp_unregister_channel(&ap->chan);