Commit 66eaea30 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename u32UserScanPvoid of struct user_scan_req

This patch renames u32UserScanPvoid of struct user_scan_req to arg
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc801855
...@@ -823,7 +823,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv, ...@@ -823,7 +823,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", hif_drv->hif_state); PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", hif_drv->hif_state);
hif_drv->usr_scan_req.scan_result = pstrHostIFscanAttr->result; hif_drv->usr_scan_req.scan_result = pstrHostIFscanAttr->result;
hif_drv->usr_scan_req.u32UserScanPvoid = pstrHostIFscanAttr->arg; hif_drv->usr_scan_req.arg = pstrHostIFscanAttr->arg;
if ((hif_drv->hif_state >= HOST_IF_SCANNING) && if ((hif_drv->hif_state >= HOST_IF_SCANNING) &&
(hif_drv->hif_state < HOST_IF_CONNECTED)) { (hif_drv->hif_state < HOST_IF_CONNECTED)) {
...@@ -971,7 +971,7 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv, ...@@ -971,7 +971,7 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv,
if (hif_drv->usr_scan_req.scan_result) { if (hif_drv->usr_scan_req.scan_result) {
hif_drv->usr_scan_req.scan_result(enuEvent, NULL, hif_drv->usr_scan_req.scan_result(enuEvent, NULL,
hif_drv->usr_scan_req.u32UserScanPvoid, NULL); hif_drv->usr_scan_req.arg, NULL);
hif_drv->usr_scan_req.scan_result = NULL; hif_drv->usr_scan_req.scan_result = NULL;
} }
...@@ -1448,7 +1448,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, ...@@ -1448,7 +1448,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
pJoinParams = host_int_ParseJoinBssParam(pstrNetworkInfo); pJoinParams = host_int_ParseJoinBssParam(pstrNetworkInfo);
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo, hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
hif_drv->usr_scan_req.u32UserScanPvoid, hif_drv->usr_scan_req.arg,
pJoinParams); pJoinParams);
} }
} else { } else {
...@@ -1457,7 +1457,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, ...@@ -1457,7 +1457,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
} else { } else {
pstrNetworkInfo->bNewNetwork = false; pstrNetworkInfo->bNewNetwork = false;
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo, hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
hif_drv->usr_scan_req.u32UserScanPvoid, NULL); hif_drv->usr_scan_req.arg, NULL);
} }
} }
...@@ -2001,7 +2001,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv) ...@@ -2001,7 +2001,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
if (hif_drv->usr_scan_req.scan_result) { if (hif_drv->usr_scan_req.scan_result) {
del_timer(&hif_drv->scan_timer); del_timer(&hif_drv->scan_timer);
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL, hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL,
hif_drv->usr_scan_req.u32UserScanPvoid, NULL); hif_drv->usr_scan_req.arg, NULL);
hif_drv->usr_scan_req.scan_result = NULL; hif_drv->usr_scan_req.scan_result = NULL;
} }
...@@ -4210,7 +4210,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv) ...@@ -4210,7 +4210,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
if (hif_drv->usr_scan_req.scan_result) { if (hif_drv->usr_scan_req.scan_result) {
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL, hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL,
hif_drv->usr_scan_req.u32UserScanPvoid, NULL); hif_drv->usr_scan_req.arg, NULL);
hif_drv->usr_scan_req.scan_result = NULL; hif_drv->usr_scan_req.scan_result = NULL;
} }
......
...@@ -193,8 +193,7 @@ struct hidden_network { ...@@ -193,8 +193,7 @@ struct hidden_network {
struct user_scan_req { struct user_scan_req {
wilc_scan_result scan_result; wilc_scan_result scan_result;
void *u32UserScanPvoid; void *arg;
u32 u32RcvdChCount; u32 u32RcvdChCount;
struct found_net_info astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS]; struct found_net_info astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
}; };
......
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