staging: wilc1000: Replace semaphore sync_event with completion

The semaphore 'sync_event' is used as completion, so convert
it to a struct completion type. Also, return -ETIME if the return
value of wait_for_completion_timeout is 0.

Signed-off-by: Binoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 5c5e8adc6ff626e49bb740c801ef1d9fcfa93a02..e0890f53323f218a589f21576a09afc2eacbc391 100644 (file)
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -241,7 +241,7 @@ void wilc_mac_indicate(struct wilc *wilc, int flag)
                                      (unsigned char *)&status, 4);
                if (wilc->mac_status == WILC_MAC_STATUS_INIT) {
                        wilc->mac_status = status;
-                       up(&wilc->sync_event);
+                       complete(&wilc->sync_event);
                } else {
                        wilc->mac_status = status;
                }
@@ -386,9 +386,9 @@ static int linux_wlan_start_firmware(struct net_device *dev)
        if (ret < 0)
                return ret;
 
-       ret = wilc_lock_timeout(wilc, &wilc->sync_event, 5000);
-       if (ret)
-               return ret;
+       if (!wait_for_completion_timeout(&wilc->sync_event,
+                                       msecs_to_jiffies(5000)))
+               return -ETIME;
 
        return 0;
 }
@@ -684,7 +684,7 @@ static int wlan_init_locks(struct net_device *dev)
        init_completion(&wl->txq_event);
 
        init_completion(&wl->cfg_event);
-       sema_init(&wl->sync_event, 0);
+       init_completion(&wl->sync_event);
        init_completion(&wl->txq_thread_started);
 
        return 0;

diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 5fbc07c456618f13fe126d5fd29a3ceef56492a6..5cc6a82d80818f7c725f5631272a4eb3db510752 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -179,7 +179,7 @@ struct wilc {
        struct mutex hif_cs;
 
        struct completion cfg_event;
-       struct semaphore sync_event;
+       struct completion sync_event;
        struct completion txq_event;
        struct completion txq_thread_started;