staging: brcm80211: replace semaphore by wait_queue for sysioc thread

The sysioc thread was triggered using a semaphore. Now it waits for
a wake_up() on its wait queue and the semaphore has been removed as
the semaphore serves another purpose. This removes a checkpatch
warning for dhd_linux.c.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index b7a741b64858b6b5a7058dbf19c5a850b5b2ca56..0d868190db8795db0147d8733cfc08ffe6bac044 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -30,6 +30,7 @@
 #include <linux/uaccess.h>
 #include <linux/hardirq.h>
 #include <linux/mutex.h>
+#include <linux/wait.h>
 #include <net/cfg80211.h>
 #include <defs.h>
 #include <brcmu_utils.h>
@@ -79,7 +80,7 @@ struct brcmf_info {
 
        /* Thread to issue ioctl for multicast */
        struct task_struct *sysioc_tsk;
-       struct semaphore sysioc_sem;
+       wait_queue_head_t sysioc_waitq;
        bool set_multicast;
        bool set_macaddress;
        u8 macvalue[ETH_ALEN];
@@ -494,12 +495,20 @@ static int _brcmf_sysioc_thread(void *data)
 #ifdef SOFTAP
        bool in_ap = false;
 #endif
-
+       DECLARE_WAITQUEUE(wait, current);
        allow_signal(SIGTERM);
 
-       while (down_interruptible(&drvr_priv->sysioc_sem) == 0) {
+       add_wait_queue(&drvr_priv->sysioc_waitq, &wait);
+       while (1) {
+               prepare_to_wait(&drvr_priv->sysioc_waitq, &wait,
+                               TASK_INTERRUPTIBLE);
+
+               /* wait for event */
+               schedule();
+
                if (kthread_should_stop())
                        break;
+
                for (i = 0; i < BRCMF_MAX_IFS; i++) {
                        struct brcmf_if *ifentry = drvr_priv->iflist[i];
                        if (ifentry) {
@@ -546,6 +555,7 @@ static int _brcmf_sysioc_thread(void *data)
                        }
                }
        }
+       finish_wait(&drvr_priv->sysioc_waitq, &wait);
        return 0;
 }
 
@@ -563,8 +573,7 @@ static int brcmf_netdev_set_mac_address(struct net_device *dev, void *addr)
 
        memcpy(&drvr_priv->macvalue, sa->sa_data, ETH_ALEN);
        drvr_priv->set_macaddress = true;
-       up(&drvr_priv->sysioc_sem);
-
+       wake_up(&drvr_priv->sysioc_waitq);
        return ret;
 }
 
@@ -578,7 +587,7 @@ static void brcmf_netdev_set_multicast_list(struct net_device *dev)
                return;
 
        drvr_priv->set_multicast = true;
-       up(&drvr_priv->sysioc_sem);
+       wake_up(&drvr_priv->sysioc_waitq);
 }
 
 int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)
@@ -1218,7 +1227,7 @@ brcmf_add_if(struct brcmf_info *drvr_priv, int ifidx, void *handle, char *name,
        if (handle == NULL) {
                ifp->state = BRCMF_E_IF_ADD;
                ifp->idx = ifidx;
-               up(&drvr_priv->sysioc_sem);
+               wake_up(&drvr_priv->sysioc_waitq);
        } else
                ifp->net = (struct net_device *)handle;
 
@@ -1239,7 +1248,7 @@ void brcmf_del_if(struct brcmf_info *drvr_priv, int ifidx)
 
        ifp->state = BRCMF_E_IF_DEL;
        ifp->idx = ifidx;
-       up(&drvr_priv->sysioc_sem);
+       wake_up(&drvr_priv->sysioc_waitq);
 }
 
 struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
@@ -1307,7 +1316,7 @@ struct brcmf_pub *brcmf_attach(struct brcmf_bus *bus, uint bus_hdrlen)
        }
 
        if (brcmf_sysioc) {
-               sema_init(&drvr_priv->sysioc_sem, 0);
+               init_waitqueue_head(&drvr_priv->sysioc_waitq);
                drvr_priv->sysioc_tsk = kthread_run(_brcmf_sysioc_thread, drvr_priv,
                                                "_brcmf_sysioc");
                if (IS_ERR(drvr_priv->sysioc_tsk)) {