Commit 04247e7d authored by Binoy Jayan's avatar Binoy Jayan Committed by Greg Kroah-Hartman
Browse files

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: default avatarBinoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa659698
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment