Commit 0711645c authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: fixes blank lines aren't necessary brace

This patch fixes the checks reported by checkpatch.pl
for Blank lines aren't necessary after an open brace '{' and
Blank lines aren't necessary before a close brace '}'.
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 d1666e2a
...@@ -615,7 +615,6 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv, ...@@ -615,7 +615,6 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
u8WidCnt++; u8WidCnt++;
} }
if (strHostIFCfgParamAttr->cfg_attr_info.flag & FRAG_THRESHOLD) { if (strHostIFCfgParamAttr->cfg_attr_info.flag & FRAG_THRESHOLD) {
if (strHostIFCfgParamAttr->cfg_attr_info.frag_threshold > 255 && strHostIFCfgParamAttr->cfg_attr_info.frag_threshold < 7937) { if (strHostIFCfgParamAttr->cfg_attr_info.frag_threshold > 255 && strHostIFCfgParamAttr->cfg_attr_info.frag_threshold < 7937) {
strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD; strWIDList[u8WidCnt].id = WID_FRAG_THRESHOLD;
strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.frag_threshold; strWIDList[u8WidCnt].val = (s8 *)&strHostIFCfgParamAttr->cfg_attr_info.frag_threshold;
...@@ -1422,7 +1421,6 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, ...@@ -1422,7 +1421,6 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
} }
for (i = 0; i < hif_drv->strWILC_UsrScanReq.u32RcvdChCount; i++) { for (i = 0; i < hif_drv->strWILC_UsrScanReq.u32RcvdChCount; i++) {
if ((hif_drv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid) && if ((hif_drv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid) &&
(pstrNetworkInfo->au8bssid)) { (pstrNetworkInfo->au8bssid)) {
if (memcmp(hif_drv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid, if (memcmp(hif_drv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid,
...@@ -1458,8 +1456,6 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv, ...@@ -1458,8 +1456,6 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
hif_drv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo, hif_drv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
hif_drv->strWILC_UsrScanReq.u32UserScanPvoid, hif_drv->strWILC_UsrScanReq.u32UserScanPvoid,
pJoinParams); pJoinParams);
} }
} else { } else {
PRINT_WRN(HOSTINF_DBG, "Discovered networks exceeded max. limit\n"); PRINT_WRN(HOSTINF_DBG, "Discovered networks exceeded max. limit\n");
...@@ -1549,7 +1545,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, ...@@ -1549,7 +1545,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
PRINT_INFO(HOSTINF_DBG, "Received association response with length = %d\n", u32RcvdAssocRespInfoLen); PRINT_INFO(HOSTINF_DBG, "Received association response with length = %d\n", u32RcvdAssocRespInfoLen);
if (u32RcvdAssocRespInfoLen != 0) { if (u32RcvdAssocRespInfoLen != 0) {
PRINT_D(HOSTINF_DBG, "Parsing association response\n"); PRINT_D(HOSTINF_DBG, "Parsing association response\n");
s32Err = ParseAssocRespInfo(rcv_assoc_resp, u32RcvdAssocRespInfoLen, s32Err = ParseAssocRespInfo(rcv_assoc_resp, u32RcvdAssocRespInfoLen,
&pstrConnectRespInfo); &pstrConnectRespInfo);
...@@ -1702,9 +1697,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv, ...@@ -1702,9 +1697,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
del_timer(&hif_drv->hScanTimer); del_timer(&hif_drv->hScanTimer);
if (hif_drv->strWILC_UsrScanReq.pfUserScanResult) if (hif_drv->strWILC_UsrScanReq.pfUserScanResult)
Handle_ScanDone(hif_drv, SCAN_EVENT_ABORTED); Handle_ScanDone(hif_drv, SCAN_EVENT_ABORTED);
} }
} }
kfree(pstrRcvdGnrlAsyncInfo->buffer); kfree(pstrRcvdGnrlAsyncInfo->buffer);
...@@ -1725,12 +1718,9 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1725,12 +1718,9 @@ static int Handle_Key(struct host_if_drv *hif_drv,
s8 ret = 0; s8 ret = 0;
switch (pstrHostIFkeyAttr->type) { switch (pstrHostIFkeyAttr->type) {
case WEP: case WEP:
if (pstrHostIFkeyAttr->action & ADDKEY_AP) { if (pstrHostIFkeyAttr->action & ADDKEY_AP) {
PRINT_D(HOSTINF_DBG, "Handling WEP key\n"); PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", pstrHostIFkeyAttr->attr.wep.index); PRINT_D(GENERIC_DBG, "ID Hostint is %d\n", pstrHostIFkeyAttr->attr.wep.index);
strWIDList[0].id = (u16)WID_11I_MODE; strWIDList[0].id = (u16)WID_11I_MODE;
...@@ -1768,8 +1758,6 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1768,8 +1758,6 @@ static int Handle_Key(struct host_if_drv *hif_drv,
result = send_config_pkt(SET_CFG, strWIDList, 4, result = send_config_pkt(SET_CFG, strWIDList, 4,
get_id_from_handler(hif_drv)); get_id_from_handler(hif_drv));
kfree(pu8keybuf); kfree(pu8keybuf);
} }
if (pstrHostIFkeyAttr->action & ADDKEY) { if (pstrHostIFkeyAttr->action & ADDKEY) {
...@@ -1794,7 +1782,6 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1794,7 +1782,6 @@ static int Handle_Key(struct host_if_drv *hif_drv,
get_id_from_handler(hif_drv)); get_id_from_handler(hif_drv));
kfree(pu8keybuf); kfree(pu8keybuf);
} else if (pstrHostIFkeyAttr->action & REMOVEKEY) { } else if (pstrHostIFkeyAttr->action & REMOVEKEY) {
PRINT_D(HOSTINF_DBG, "Removing key\n"); PRINT_D(HOSTINF_DBG, "Removing key\n");
strWID.id = (u16)WID_REMOVE_WEP_KEY; strWID.id = (u16)WID_REMOVE_WEP_KEY;
strWID.type = WID_STR; strWID.type = WID_STR;
...@@ -1895,14 +1882,11 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1895,14 +1882,11 @@ static int Handle_Key(struct host_if_drv *hif_drv,
case WPAPtk: case WPAPtk:
if (pstrHostIFkeyAttr->action & ADDKEY_AP) { if (pstrHostIFkeyAttr->action & ADDKEY_AP) {
pu8keybuf = kmalloc(PTK_KEY_MSG_LEN + 1, GFP_KERNEL); pu8keybuf = kmalloc(PTK_KEY_MSG_LEN + 1, GFP_KERNEL);
if (!pu8keybuf) { if (!pu8keybuf) {
PRINT_ER("No buffer to send PTK Key\n"); PRINT_ER("No buffer to send PTK Key\n");
ret = -ENOMEM; ret = -ENOMEM;
goto _WPAPtk_end_case_; goto _WPAPtk_end_case_;
} }
memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.mac_addr, 6); memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.mac_addr, 6);
...@@ -1927,14 +1911,11 @@ static int Handle_Key(struct host_if_drv *hif_drv, ...@@ -1927,14 +1911,11 @@ static int Handle_Key(struct host_if_drv *hif_drv,
up(&hif_drv->hSemTestKeyBlock); up(&hif_drv->hSemTestKeyBlock);
} }
if (pstrHostIFkeyAttr->action & ADDKEY) { if (pstrHostIFkeyAttr->action & ADDKEY) {
pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL); pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL);
if (!pu8keybuf) { if (!pu8keybuf) {
PRINT_ER("No buffer to send PTK Key\n"); PRINT_ER("No buffer to send PTK Key\n");
ret = -ENOMEM; ret = -ENOMEM;
goto _WPAPtk_end_case_; goto _WPAPtk_end_case_;
} }
memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.mac_addr, 6); memcpy(pu8keybuf, pstrHostIFkeyAttr->attr.wpa.mac_addr, 6);
...@@ -2072,7 +2053,6 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv) ...@@ -2072,7 +2053,6 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
kfree(info_element); kfree(info_element);
info_element = NULL; info_element = NULL;
} }
} }
up(&hif_drv->hSemTestDisconnectBlock); up(&hif_drv->hSemTestDisconnectBlock);
...@@ -2134,8 +2114,6 @@ static void Handle_GetRssi(struct host_if_drv *hif_drv) ...@@ -2134,8 +2114,6 @@ static void Handle_GetRssi(struct host_if_drv *hif_drv)
} }
up(&hif_drv->hSemGetRSSI); up(&hif_drv->hSemGetRSSI);
} }
...@@ -2206,7 +2184,6 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv, struct rf_info *pstrStatis ...@@ -2206,7 +2184,6 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv, struct rf_info *pstrStatis
up(&hif_sema_wait_response); up(&hif_sema_wait_response);
return 0; return 0;
} }
static s32 Handle_Get_InActiveTime(struct host_if_drv *hif_drv, static s32 Handle_Get_InActiveTime(struct host_if_drv *hif_drv,
...@@ -2744,7 +2721,6 @@ static void Handle_SetMulticastFilter(struct host_if_drv *hif_drv, ...@@ -2744,7 +2721,6 @@ static void Handle_SetMulticastFilter(struct host_if_drv *hif_drv,
ERRORHANDLER: ERRORHANDLER:
kfree(strWID.val); kfree(strWID.val);
} }
static s32 Handle_AddBASession(struct host_if_drv *hif_drv, static s32 Handle_AddBASession(struct host_if_drv *hif_drv,
...@@ -2810,7 +2786,6 @@ static s32 Handle_AddBASession(struct host_if_drv *hif_drv, ...@@ -2810,7 +2786,6 @@ static s32 Handle_AddBASession(struct host_if_drv *hif_drv,
kfree(strWID.val); kfree(strWID.val);
return result; return result;
} }
static s32 Handle_DelAllRxBASessions(struct host_if_drv *hif_drv, static s32 Handle_DelAllRxBASessions(struct host_if_drv *hif_drv,
...@@ -3842,7 +3817,6 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hif_drv, u32 *pu32TestMemAddr) ...@@ -3842,7 +3817,6 @@ s32 host_int_test_get_int_wid(struct host_if_drv *hif_drv, u32 *pu32TestMemAddr)
return -EINVAL; return -EINVAL;
} else { } else {
PRINT_D(HOSTINF_DBG, "Successfully got wid value\n"); PRINT_D(HOSTINF_DBG, "Successfully got wid value\n");
} }
return result; return result;
...@@ -4009,7 +3983,6 @@ s32 hif_get_cfg(struct host_if_drv *hif_drv, u16 u16WID, u16 *pu16WID_Value) ...@@ -4009,7 +3983,6 @@ s32 hif_get_cfg(struct host_if_drv *hif_drv, u16 u16WID, u16 *pu16WID_Value)
} }
PRINT_D(HOSTINF_DBG, "Getting configuration parameters\n"); PRINT_D(HOSTINF_DBG, "Getting configuration parameters\n");
switch (u16WID) { switch (u16WID) {
case WID_BSS_TYPE: case WID_BSS_TYPE:
*pu16WID_Value = (u16)hif_drv->strCfgValues.bss_type; *pu16WID_Value = (u16)hif_drv->strCfgValues.bss_type;
break; break;
...@@ -4416,7 +4389,6 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length) ...@@ -4416,7 +4389,6 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
return; return;
} }
s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID, s32 host_int_remain_on_channel(struct host_if_drv *hif_drv, u32 u32SessionID,
...@@ -4566,7 +4538,6 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval, ...@@ -4566,7 +4538,6 @@ s32 host_int_add_beacon(struct host_if_drv *hif_drv, u32 u32Interval,
} }
return result; return result;
} }
s32 host_int_del_beacon(struct host_if_drv *hif_drv) s32 host_int_del_beacon(struct host_if_drv *hif_drv)
...@@ -4955,14 +4926,10 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo) ...@@ -4955,14 +4926,10 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
continue; continue;
} else } else
index += pu8IEs[index + 1] + 2; index += pu8IEs[index + 1] + 2;
} }
} }
return (void *)pNewJoinBssParam; return (void *)pNewJoinBssParam;
} }
void host_int_freeJoinParams(void *pJoinParams) void host_int_freeJoinParams(void *pJoinParams)
......
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