UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: wilc1000: fixes please don't use multiple blank lines 

This patch fixes the checks reported by checkpatch.pl
for Please don't use multiple blank lines.

Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Leo Kim 2015-10-28 15:59:25 +09:00 committed by Greg Kroah-Hartman
parent c09389acd4
commit 96a6800089
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/staging/wilc1000/host_interface.c
View File

@ -527,7 +527,6 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
down(&hif_drv->gtOsCfgValuesSem); down(&hif_drv->gtOsCfgValuesSem);
PRINT_D(HOSTINF_DBG, "Setting CFG params\n"); PRINT_D(HOSTINF_DBG, "Setting CFG params\n");
if (strHostIFCfgParamAttr->cfg_attr_info.flag & BSS_TYPE) { if (strHostIFCfgParamAttr->cfg_attr_info.flag & BSS_TYPE) {
@ -842,7 +841,6 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Setting SCAN params\n"); PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
hif_drv->strWILC_UsrScanReq.u32RcvdChCount = 0; hif_drv->strWILC_UsrScanReq.u32RcvdChCount = 0;
strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ; strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
@ -865,8 +863,6 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
pu8Buffer += pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].u8ssidlen; pu8Buffer += pstrHostIFscanAttr->hidden_network.pstrHiddenNetworkInfo[i].u8ssidlen;
} }
strWIDList[u32WidsCount].size = (s32)(valuesize + 1); strWIDList[u32WidsCount].size = (s32)(valuesize + 1);
u32WidsCount++; u32WidsCount++;
} }
@ -947,7 +943,6 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv,
u8 u8abort_running_scan; u8 u8abort_running_scan;
struct wid strWID; struct wid strWID;
PRINT_D(HOSTINF_DBG, "in Handle_ScanDone()\n"); PRINT_D(HOSTINF_DBG, "in Handle_ScanDone()\n");
if (enuEvent == SCAN_EVENT_ABORTED) { if (enuEvent == SCAN_EVENT_ABORTED) {
@ -1078,7 +1073,6 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", hif_drv->strWILC_UsrConnReq.u8security); PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", hif_drv->strWILC_UsrConnReq.u8security);
strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE; strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].size = sizeof(char);
@ -1294,8 +1288,6 @@ static s32 Handle_FlushConnect(struct host_if_drv *hif_drv)
strWIDList[u32WidsCount].val = (s8 *)(&(mode_11i)); strWIDList[u32WidsCount].val = (s8 *)(&(mode_11i));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE; strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR; strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); strWIDList[u32WidsCount].size = sizeof(char);
@ -1559,8 +1551,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
PRINT_INFO(HOSTINF_DBG, "Association response received : Successful connection status\n"); PRINT_INFO(HOSTINF_DBG, "Association response received : Successful connection status\n");
if (pstrConnectRespInfo->pu8RespIEs) { if (pstrConnectRespInfo->pu8RespIEs) {
strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->u16RespIEsLen; strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->u16RespIEsLen;
strConnectInfo.pu8RespIEs = kmalloc(pstrConnectRespInfo->u16RespIEsLen, GFP_KERNEL); strConnectInfo.pu8RespIEs = kmalloc(pstrConnectRespInfo->u16RespIEsLen, GFP_KERNEL);
memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->pu8RespIEs, memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->pu8RespIEs,
pstrConnectRespInfo->u16RespIEsLen); pstrConnectRespInfo->u16RespIEsLen);
@ -1596,7 +1586,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
} }
} }
if (hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs) { if (hif_drv->strWILC_UsrConnReq.pu8ConnReqIEs) {
strConnectInfo.ReqIEsLen = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen; strConnectInfo.ReqIEsLen = hif_drv->strWILC_UsrConnReq.ConnReqIEsLen;
strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->strWILC_UsrConnReq.ConnReqIEsLen, GFP_KERNEL); strConnectInfo.pu8ReqIEs = kmalloc(hif_drv->strWILC_UsrConnReq.ConnReqIEsLen, GFP_KERNEL);
@ -1605,7 +1594,6 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv *hif_drv,
hif_drv->strWILC_UsrConnReq.ConnReqIEsLen); hif_drv->strWILC_UsrConnReq.ConnReqIEsLen);
} }
del_timer(&hif_drv->hConnectTimer); del_timer(&hif_drv->hConnectTimer);
hif_drv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP, hif_drv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
&strConnectInfo, &strConnectInfo,
@ -1943,7 +1931,6 @@ _WPAPtk_end_case_:
break; break;
case PMKSA: case PMKSA:
PRINT_D(HOSTINF_DBG, "Handling PMKSA key\n"); PRINT_D(HOSTINF_DBG, "Handling PMKSA key\n");
@ -1991,8 +1978,6 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
strWID.val = (s8 *)&u16DummyReasonCode; strWID.val = (s8 *)&u16DummyReasonCode;
strWID.size = sizeof(char); strWID.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Sending disconnect request\n"); PRINT_D(HOSTINF_DBG, "Sending disconnect request\n");
g_obtainingIP = false; g_obtainingIP = false;
@ -2060,7 +2045,6 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
up(&hif_drv->hSemTestDisconnectBlock); up(&hif_drv->hSemTestDisconnectBlock);
} }
void resolve_disconnect_aberration(struct host_if_drv *hif_drv) void resolve_disconnect_aberration(struct host_if_drv *hif_drv)
{ {
if (!hif_drv) if (!hif_drv)
@ -2118,7 +2102,6 @@ static void Handle_GetRssi(struct host_if_drv *hif_drv)
up(&hif_drv->hSemGetRSSI); up(&hif_drv->hSemGetRSSI);
} }
static void Handle_GetLinkspeed(struct host_if_drv *hif_drv) static void Handle_GetLinkspeed(struct host_if_drv *hif_drv)
{ {
s32 result = 0; s32 result = 0;
@ -2200,11 +2183,9 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *hif_drv,
strWID.size = ETH_ALEN; strWID.size = ETH_ALEN;
strWID.val = kmalloc(strWID.size, GFP_KERNEL); strWID.val = kmalloc(strWID.size, GFP_KERNEL);
stamac = strWID.val; stamac = strWID.val;
memcpy(stamac, strHostIfStaInactiveT->mac, ETH_ALEN); memcpy(stamac, strHostIfStaInactiveT->mac, ETH_ALEN);
PRINT_D(CFG80211_DBG, "SETING STA inactive time\n"); PRINT_D(CFG80211_DBG, "SETING STA inactive time\n");
result = send_config_pkt(SET_CFG, &strWID, 1, result = send_config_pkt(SET_CFG, &strWID, 1,
@ -2215,7 +2196,6 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv *hif_drv,
return -EFAULT; return -EFAULT;
} }
strWID.id = (u16)WID_GET_INACTIVE_TIME; strWID.id = (u16)WID_GET_INACTIVE_TIME;
strWID.type = WID_INT; strWID.type = WID_INT;
strWID.val = (s8 *)&inactive_time; strWID.val = (s8 *)&inactive_time;
@ -2767,7 +2747,6 @@ static s32 Handle_AddBASession(struct host_if_drv *hif_drv,
if (result) if (result)
PRINT_D(HOSTINF_DBG, "Couldn't open BA Session\n"); PRINT_D(HOSTINF_DBG, "Couldn't open BA Session\n");
strWID.id = (u16)WID_11E_P_ACTION_REQ; strWID.id = (u16)WID_11E_P_ACTION_REQ;
strWID.type = WID_STR; strWID.type = WID_STR;
strWID.size = 15; strWID.size = 15;
@ -2822,7 +2801,6 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv *hif_drv,
if (result) if (result)
PRINT_D(HOSTINF_DBG, "Couldn't delete BA Session\n"); PRINT_D(HOSTINF_DBG, "Couldn't delete BA Session\n");
kfree(strWID.val); kfree(strWID.val);
up(&hif_sema_wait_response); up(&hif_sema_wait_response);
@ -3109,7 +3087,6 @@ int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index)
int result = 0; int result = 0;
struct host_if_msg msg; struct host_if_msg msg;
if (!hif_drv) { if (!hif_drv) {
result = -EFAULT; result = -EFAULT;
PRINT_ER("driver is null\n"); PRINT_ER("driver is null\n");
@ -3118,7 +3095,6 @@ int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index)
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_KEY; msg.id = HOST_IF_MSG_KEY;
msg.body.key_info.type = WEP; msg.body.key_info.type = WEP;
msg.body.key_info.action = DEFAULTKEY; msg.body.key_info.action = DEFAULTKEY;
@ -3148,7 +3124,6 @@ s32 host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv,
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_KEY; msg.id = HOST_IF_MSG_KEY;
msg.body.key_info.type = WEP; msg.body.key_info.type = WEP;
msg.body.key_info.action = ADDKEY; msg.body.key_info.action = ADDKEY;
@ -3231,7 +3206,6 @@ s32 host_int_add_ptk(struct host_if_drv *hif_drv, const u8 *pu8Ptk,
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_KEY; msg.id = HOST_IF_MSG_KEY;
msg.body.key_info.type = WPAPtk; msg.body.key_info.type = WPAPtk;
if (mode == AP_MODE) { if (mode == AP_MODE) {
@ -3301,7 +3275,6 @@ s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv, const u8 *pu8RxGtk,
memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, u32KeyRSClen); memcpy(msg.body.key_info.attr.wpa.seq, KeyRSC, u32KeyRSClen);
} }
msg.id = HOST_IF_MSG_KEY; msg.id = HOST_IF_MSG_KEY;
msg.body.key_info.type = WPARxGtk; msg.body.key_info.type = WPARxGtk;
msg.drv = hif_drv; msg.drv = hif_drv;
@ -3343,7 +3316,6 @@ s32 host_int_set_pmkid_info(struct host_if_drv *hif_drv, struct host_if_pmkid_at
struct host_if_msg msg; struct host_if_msg msg;
u32 i; u32 i;
if (!hif_drv) { if (!hif_drv) {
PRINT_ER("driver is null\n"); PRINT_ER("driver is null\n");
return -EFAULT; return -EFAULT;
@ -3957,7 +3929,6 @@ s32 hif_set_cfg(struct host_if_drv *hif_drv,
s32 result = 0; s32 result = 0;
struct host_if_msg msg; struct host_if_msg msg;
if (!hif_drv) { if (!hif_drv) {
PRINT_ER("hif_drv NULL\n"); PRINT_ER("hif_drv NULL\n");
return -EFAULT; return -EFAULT;
@ -4297,9 +4268,6 @@ void NetworkInfoReceived(u8 *pu8Buffer, u32 u32Length)
id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24)); id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
hif_drv = get_handler_from_id(id); hif_drv = get_handler_from_id(id);
if (!hif_drv || hif_drv == terminated_handle) { if (!hif_drv || hif_drv == terminated_handle) {
PRINT_ER("NetworkInfo received but driver not init[%p]\n", hif_drv); PRINT_ER("NetworkInfo received but driver not init[%p]\n", hif_drv);
return; return;
@ -4332,7 +4300,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
hif_drv = get_handler_from_id(id); hif_drv = get_handler_from_id(id);
PRINT_D(HOSTINF_DBG, "General asynchronous info packet received\n"); PRINT_D(HOSTINF_DBG, "General asynchronous info packet received\n");
if (!hif_drv || hif_drv == terminated_handle) { if (!hif_drv || hif_drv == terminated_handle) {
PRINT_D(HOSTINF_DBG, "Wifi driver handler is equal to NULL\n"); PRINT_D(HOSTINF_DBG, "Wifi driver handler is equal to NULL\n");
up(&hif_sema_deinit); up(&hif_sema_deinit);
@ -4347,7 +4314,6 @@ void GnrlAsyncInfoReceived(u8 *pu8Buffer, u32 u32Length)
memset(&msg, 0, sizeof(struct host_if_msg)); memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO; msg.id = HOST_IF_MSG_RCVD_GNRL_ASYNC_INFO;
msg.drv = hif_drv; msg.drv = hif_drv;
@ -4372,7 +4338,6 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24)); id = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
hif_drv = get_handler_from_id(id); hif_drv = get_handler_from_id(id);
PRINT_D(GENERIC_DBG, "Scan notification received %p\n", hif_drv); PRINT_D(GENERIC_DBG, "Scan notification received %p\n", hif_drv);
if (!hif_drv || hif_drv == terminated_handle) if (!hif_drv || hif_drv == terminated_handle)
@ -4389,7 +4354,6 @@ void host_int_ScanCompleteReceived(u8 *pu8Buffer, u32 u32Length)
PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", result); PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", result);
} }
return; return;
} }
@ -4570,7 +4534,6 @@ s32 host_int_add_station(struct host_if_drv *hif_drv,
struct host_if_msg msg; struct host_if_msg msg;
struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info; struct add_sta_param *pstrAddStationMsg = &msg.body.add_sta_info;
if (!hif_drv) { if (!hif_drv) {
PRINT_ER("driver is null\n"); PRINT_ER("driver is null\n");
return -EFAULT; return -EFAULT;
@ -4639,7 +4602,6 @@ s32 host_int_del_allstation(struct host_if_drv *hif_drv,
u32 i; u32 i;
u8 u8AssocNumb = 0; u8 u8AssocNumb = 0;
if (!hif_drv) { if (!hif_drv) {
PRINT_ER("driver is null\n"); PRINT_ER("driver is null\n");
return -EFAULT; return -EFAULT;
@ -4757,7 +4719,6 @@ s32 host_int_setup_multicast_filter(struct host_if_drv *hif_drv,
struct host_if_msg msg; struct host_if_msg msg;
struct set_multicast *pstrMulticastFilterParam = &msg.body.multicast_info; struct set_multicast *pstrMulticastFilterParam = &msg.body.multicast_info;
if (!hif_drv) { if (!hif_drv) {
PRINT_ER("driver is null\n"); PRINT_ER("driver is null\n");
return -EFAULT; return -EFAULT;