malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: wilc1000: Replace semaphore sync_event with completion

Browse Source 
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>
This commit is contained in:
Binoy Jayan 2016-06-15 11:00:37 +05:30 committed by Greg Kroah-Hartman
parent fa6596982f
commit 04247e7d65
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/wilc1000/linux_wlan.c
View File

@ -241,7 +241,7 @@ void wilc_mac_indicate(struct wilc *wilc, int flag)
(unsigned char *)&status, 4); (unsigned char *)&status, 4);
if (wilc->mac_status == WILC_MAC_STATUS_INIT) { if (wilc->mac_status == WILC_MAC_STATUS_INIT) {
wilc->mac_status = status; wilc->mac_status = status;
up(&wilc->sync_event); complete(&wilc->sync_event);
} else { } else {
wilc->mac_status = status; wilc->mac_status = status;
} }
@ -386,9 +386,9 @@ static int linux_wlan_start_firmware(struct net_device *dev)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = wilc_lock_timeout(wilc, &wilc->sync_event, 5000); if (!wait_for_completion_timeout(&wilc->sync_event,
if (ret) msecs_to_jiffies(5000)))
return ret; return -ETIME;
return 0; return 0;
} }
@ -684,7 +684,7 @@ static int wlan_init_locks(struct net_device *dev)
init_completion(&wl->txq_event); init_completion(&wl->txq_event);
init_completion(&wl->cfg_event); init_completion(&wl->cfg_event);
sema_init(&wl->sync_event, 0); init_completion(&wl->sync_event);
init_completion(&wl->txq_thread_started); init_completion(&wl->txq_thread_started);
return 0; return 0;

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -179,7 +179,7 @@ struct wilc {
struct mutex hif_cs; struct mutex hif_cs;
struct completion cfg_event; struct completion cfg_event;
struct semaphore sync_event; struct completion sync_event;
struct completion txq_event; struct completion txq_event;
struct completion txq_thread_started; struct completion txq_thread_started;