openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: wilc1000: use mutex instead of struct semaphore hSemScanReq 

This patch replaces struct semaphore hSemScanReq with struct mutex
scan_req_lock. It is better to use mutex than semaphore.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chaehyun Lim 2016-03-28 13:56:00 +09:00 committed by Greg Kroah-Hartman
parent 589c667d8a
commit 086620978b
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/wilc_wfi_cfgoperations.c
View File

@ -451,7 +451,7 @@ static void CfgScanResult(enum scan_event scan_event,
} else if (scan_event == SCAN_EVENT_DONE) { } else if (scan_event == SCAN_EVENT_DONE) {
refresh_scan(priv, 1, false); refresh_scan(priv, 1, false);
down(&(priv->hSemScanReq)); mutex_lock(&priv->scan_req_lock);
if (priv->pstrScanReq) { if (priv->pstrScanReq) {
cfg80211_scan_done(priv->pstrScanReq, false); cfg80211_scan_done(priv->pstrScanReq, false);
@ -459,9 +459,9 @@ static void CfgScanResult(enum scan_event scan_event,
priv->bCfgScanning = false; priv->bCfgScanning = false;
priv->pstrScanReq = NULL; priv->pstrScanReq = NULL;
} }
up(&(priv->hSemScanReq)); mutex_unlock(&priv->scan_req_lock);
} else if (scan_event == SCAN_EVENT_ABORTED) { } else if (scan_event == SCAN_EVENT_ABORTED) {
down(&(priv->hSemScanReq)); mutex_lock(&priv->scan_req_lock);
if (priv->pstrScanReq) { if (priv->pstrScanReq) {
update_scan_time(); update_scan_time();
@ -471,7 +471,7 @@ static void CfgScanResult(enum scan_event scan_event,
priv->bCfgScanning = false; priv->bCfgScanning = false;
priv->pstrScanReq = NULL; priv->pstrScanReq = NULL;
} }
up(&(priv->hSemScanReq)); mutex_unlock(&priv->scan_req_lock);
} }
} }
} }
@ -2307,7 +2307,7 @@ int wilc_init_host_int(struct net_device *net)
priv->bInP2PlistenState = false; priv->bInP2PlistenState = false;
sema_init(&(priv->hSemScanReq), 1); mutex_init(&priv->scan_req_lock);
s32Error = wilc_init(net, &priv->hif_drv); s32Error = wilc_init(net, &priv->hif_drv);
if (s32Error) if (s32Error)
netdev_err(net, "Error while initializing hostinterface\n"); netdev_err(net, "Error while initializing hostinterface\n");

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

@ -130,7 +130,7 @@ struct wilc_priv {
struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA]; struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA];
u8 wilc_groupkey; u8 wilc_groupkey;
/* semaphores */ /* semaphores */
struct semaphore hSemScanReq; struct mutex scan_req_lock;
/* */ /* */
bool gbAutoRateAdjusted; bool gbAutoRateAdjusted;