Skip to content

L
linux
Commit 173508b8 authored by Ajay Singh's avatar Ajay Singh Committed by Greg Kroah-Hartman
Browse files
Options

staging: wilc1000: rename strWIDList variable to avoid camelCase 

Fix "Avoid camelCase" issue found by checkpatch.pl script.
Signed-off-by: default avatarAjay Singh <ajay.kathat@microchip.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0414b407
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 88 deletions
drivers/staging/wilc1000/host_interface.c
View file @ 173508b8
...@@ -906,7 +906,7 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -906,7 +906,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
struct connect_attr *pstrHostIFconnectAttr) struct connect_attr *pstrHostIFconnectAttr)
{ {
s32 result = 0; s32 result = 0;
struct wid strWIDList[8]; struct wid wid_list[8];
u32 u32WidsCount = 0, dummyval = 0; u32 u32WidsCount = 0, dummyval = 0;
u8 *pu8CurrByte = NULL; u8 *pu8CurrByte = NULL;
struct join_bss_param *ptstrJoinBssParam; struct join_bss_param *ptstrJoinBssParam;
...@@ -952,29 +952,29 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -952,29 +952,29 @@ static s32 Handle_Connect(struct wilc_vif *vif,
hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result; hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg; hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT; wid_list[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT; wid_list[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32); wid_list[u32WidsCount].size = sizeof(u32);
strWIDList[u32WidsCount].val = (s8 *)(&(dummyval)); wid_list[u32WidsCount].val = (s8 *)(&(dummyval));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT; wid_list[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT; wid_list[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32); wid_list[u32WidsCount].size = sizeof(u32);
strWIDList[u32WidsCount].val = (s8 *)(&(dummyval)); wid_list[u32WidsCount].val = (s8 *)(&(dummyval));
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_FAILED_COUNT; wid_list[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT; wid_list[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32); wid_list[u32WidsCount].size = sizeof(u32);
strWIDList[u32WidsCount].val = (s8 *)(&(dummyval)); wid_list[u32WidsCount].val = (s8 *)(&(dummyval));
u32WidsCount++; u32WidsCount++;
{ {
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE; wid_list[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA; wid_list[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].val = hif_drv->usr_conn_req.ies; wid_list[u32WidsCount].val = hif_drv->usr_conn_req.ies;
strWIDList[u32WidsCount].size = hif_drv->usr_conn_req.ies_len; wid_list[u32WidsCount].size = hif_drv->usr_conn_req.ies_len;
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
...@@ -984,39 +984,39 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -984,39 +984,39 @@ static s32 Handle_Connect(struct wilc_vif *vif,
info_element_size); info_element_size);
} }
} }
strWIDList[u32WidsCount].id = (u16)WID_11I_MODE; wid_list[u32WidsCount].id = (u16)WID_11I_MODE;
strWIDList[u32WidsCount].type = WID_CHAR; wid_list[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); wid_list[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.security; wid_list[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.security;
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
mode_11i = hif_drv->usr_conn_req.security; mode_11i = hif_drv->usr_conn_req.security;
strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE; wid_list[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR; wid_list[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); wid_list[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.auth_type; wid_list[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.auth_type;
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
auth_type = (u8)hif_drv->usr_conn_req.auth_type; auth_type = (u8)hif_drv->usr_conn_req.auth_type;
strWIDList[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED; wid_list[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;
strWIDList[u32WidsCount].type = WID_STR; wid_list[u32WidsCount].type = WID_STR;
strWIDList[u32WidsCount].size = 112; wid_list[u32WidsCount].size = 112;
strWIDList[u32WidsCount].val = kmalloc(strWIDList[u32WidsCount].size, GFP_KERNEL); wid_list[u32WidsCount].val = kmalloc(wid_list[u32WidsCount].size, GFP_KERNEL);
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
join_req_size = strWIDList[u32WidsCount].size; join_req_size = wid_list[u32WidsCount].size;
join_req = kmalloc(join_req_size, GFP_KERNEL); join_req = kmalloc(join_req_size, GFP_KERNEL);
} }
if (!strWIDList[u32WidsCount].val) { if (!wid_list[u32WidsCount].val) {
result = -EFAULT; result = -EFAULT;
goto ERRORHANDLER; goto ERRORHANDLER;
} }
pu8CurrByte = strWIDList[u32WidsCount].val; pu8CurrByte = wid_list[u32WidsCount].val;
if (pstrHostIFconnectAttr->ssid) { if (pstrHostIFconnectAttr->ssid) {
memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssid_len); memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssid_len);
...@@ -1095,7 +1095,7 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -1095,7 +1095,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
pu8CurrByte += sizeof(ptstrJoinBssParam->start_time); pu8CurrByte += sizeof(ptstrJoinBssParam->start_time);
} }
pu8CurrByte = strWIDList[u32WidsCount].val; pu8CurrByte = wid_list[u32WidsCount].val;
u32WidsCount++; u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) { if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
...@@ -1107,7 +1107,7 @@ static s32 Handle_Connect(struct wilc_vif *vif, ...@@ -1107,7 +1107,7 @@ static s32 Handle_Connect(struct wilc_vif *vif,
memcpy(wilc_connected_ssid, memcpy(wilc_connected_ssid,
pstrHostIFconnectAttr->bssid, ETH_ALEN); pstrHostIFconnectAttr->bssid, ETH_ALEN);
result = wilc_send_config_pkt(vif, SET_CFG, strWIDList, result = wilc_send_config_pkt(vif, SET_CFG, wid_list,
u32WidsCount, u32WidsCount,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
if (result) { if (result) {
...@@ -1530,7 +1530,7 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1530,7 +1530,7 @@ static int Handle_Key(struct wilc_vif *vif,
{ {
s32 result = 0; s32 result = 0;
struct wid wid; struct wid wid;
struct wid strWIDList[5]; struct wid wid_list[5];
u8 i; u8 i;
u8 *pu8keybuf; u8 *pu8keybuf;
s8 s8idxarray[1]; s8 s8idxarray[1];
...@@ -1541,15 +1541,15 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1541,15 +1541,15 @@ static int Handle_Key(struct wilc_vif *vif,
case WEP: case WEP:
if (pstrHostIFkeyAttr->action & ADDKEY_AP) { if (pstrHostIFkeyAttr->action & ADDKEY_AP) {
strWIDList[0].id = (u16)WID_11I_MODE; wid_list[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR; wid_list[0].type = WID_CHAR;
strWIDList[0].size = sizeof(char); wid_list[0].size = sizeof(char);
strWIDList[0].val = (s8 *)&pstrHostIFkeyAttr->attr.wep.mode; wid_list[0].val = (s8 *)&pstrHostIFkeyAttr->attr.wep.mode;
strWIDList[1].id = WID_AUTH_TYPE; wid_list[1].id = WID_AUTH_TYPE;
strWIDList[1].type = WID_CHAR; wid_list[1].type = WID_CHAR;
strWIDList[1].size = sizeof(char); wid_list[1].size = sizeof(char);
strWIDList[1].val = (s8 *)&pstrHostIFkeyAttr->attr.wep.auth_type; wid_list[1].val = (s8 *)&pstrHostIFkeyAttr->attr.wep.auth_type;
pu8keybuf = kmalloc(pstrHostIFkeyAttr->attr.wep.key_len + 2, pu8keybuf = kmalloc(pstrHostIFkeyAttr->attr.wep.key_len + 2,
GFP_KERNEL); GFP_KERNEL);
...@@ -1564,13 +1564,13 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1564,13 +1564,13 @@ static int Handle_Key(struct wilc_vif *vif,
kfree(pstrHostIFkeyAttr->attr.wep.key); kfree(pstrHostIFkeyAttr->attr.wep.key);
strWIDList[2].id = (u16)WID_WEP_KEY_VALUE; wid_list[2].id = (u16)WID_WEP_KEY_VALUE;
strWIDList[2].type = WID_STR; wid_list[2].type = WID_STR;
strWIDList[2].size = pstrHostIFkeyAttr->attr.wep.key_len + 2; wid_list[2].size = pstrHostIFkeyAttr->attr.wep.key_len + 2;
strWIDList[2].val = (s8 *)pu8keybuf; wid_list[2].val = (s8 *)pu8keybuf;
result = wilc_send_config_pkt(vif, SET_CFG, result = wilc_send_config_pkt(vif, SET_CFG,
strWIDList, 3, wid_list, 3,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
} else if (pstrHostIFkeyAttr->action & ADDKEY) { } else if (pstrHostIFkeyAttr->action & ADDKEY) {
...@@ -1632,18 +1632,18 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1632,18 +1632,18 @@ static int Handle_Key(struct wilc_vif *vif,
memcpy(pu8keybuf + 16, pstrHostIFkeyAttr->attr.wpa.key, memcpy(pu8keybuf + 16, pstrHostIFkeyAttr->attr.wpa.key,
pstrHostIFkeyAttr->attr.wpa.key_len); pstrHostIFkeyAttr->attr.wpa.key_len);
strWIDList[0].id = (u16)WID_11I_MODE; wid_list[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR; wid_list[0].type = WID_CHAR;
strWIDList[0].size = sizeof(char); wid_list[0].size = sizeof(char);
strWIDList[0].val = (s8 *)&pstrHostIFkeyAttr->attr.wpa.mode; wid_list[0].val = (s8 *)&pstrHostIFkeyAttr->attr.wpa.mode;
strWIDList[1].id = (u16)WID_ADD_RX_GTK; wid_list[1].id = (u16)WID_ADD_RX_GTK;
strWIDList[1].type = WID_STR; wid_list[1].type = WID_STR;
strWIDList[1].val = (s8 *)pu8keybuf; wid_list[1].val = (s8 *)pu8keybuf;
strWIDList[1].size = RX_MIC_KEY_MSG_LEN; wid_list[1].size = RX_MIC_KEY_MSG_LEN;
result = wilc_send_config_pkt(vif, SET_CFG, result = wilc_send_config_pkt(vif, SET_CFG,
strWIDList, 2, wid_list, 2,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
...@@ -1700,18 +1700,18 @@ static int Handle_Key(struct wilc_vif *vif, ...@@ -1700,18 +1700,18 @@ static int Handle_Key(struct wilc_vif *vif,
memcpy(pu8keybuf + 8, pstrHostIFkeyAttr->attr.wpa.key, memcpy(pu8keybuf + 8, pstrHostIFkeyAttr->attr.wpa.key,
pstrHostIFkeyAttr->attr.wpa.key_len); pstrHostIFkeyAttr->attr.wpa.key_len);
strWIDList[0].id = (u16)WID_11I_MODE; wid_list[0].id = (u16)WID_11I_MODE;
strWIDList[0].type = WID_CHAR; wid_list[0].type = WID_CHAR;
strWIDList[0].size = sizeof(char); wid_list[0].size = sizeof(char);
strWIDList[0].val = (s8 *)&pstrHostIFkeyAttr->attr.wpa.mode; wid_list[0].val = (s8 *)&pstrHostIFkeyAttr->attr.wpa.mode;
strWIDList[1].id = (u16)WID_ADD_PTK; wid_list[1].id = (u16)WID_ADD_PTK;
strWIDList[1].type = WID_STR; wid_list[1].type = WID_STR;
strWIDList[1].val = (s8 *)pu8keybuf; wid_list[1].val = (s8 *)pu8keybuf;
strWIDList[1].size = PTK_KEY_MSG_LEN + 1; wid_list[1].size = PTK_KEY_MSG_LEN + 1;
result = wilc_send_config_pkt(vif, SET_CFG, result = wilc_send_config_pkt(vif, SET_CFG,
strWIDList, 2, wid_list, 2,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
kfree(pu8keybuf); kfree(pu8keybuf);
complete(&hif_drv->comp_test_key_block); complete(&hif_drv->comp_test_key_block);
...@@ -1892,40 +1892,40 @@ static void Handle_GetRssi(struct wilc_vif *vif) ...@@ -1892,40 +1892,40 @@ static void Handle_GetRssi(struct wilc_vif *vif)
static s32 Handle_GetStatistics(struct wilc_vif *vif, static s32 Handle_GetStatistics(struct wilc_vif *vif,
struct rf_info *pstrStatistics) struct rf_info *pstrStatistics)
{ {
struct wid strWIDList[5]; struct wid wid_list[5];
u32 u32WidsCount = 0, result = 0; u32 u32WidsCount = 0, result = 0;
strWIDList[u32WidsCount].id = WID_LINKSPEED; wid_list[u32WidsCount].id = WID_LINKSPEED;
strWIDList[u32WidsCount].type = WID_CHAR; wid_list[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); wid_list[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->link_speed; wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->link_speed;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RSSI; wid_list[u32WidsCount].id = WID_RSSI;
strWIDList[u32WidsCount].type = WID_CHAR; wid_list[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char); wid_list[u32WidsCount].size = sizeof(char);
strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->rssi; wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->rssi;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT; wid_list[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT; wid_list[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32); wid_list[u32WidsCount].size = sizeof(u32);
strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->tx_cnt; wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->tx_cnt;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT; wid_list[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT; wid_list[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32); wid_list[u32WidsCount].size = sizeof(u32);
strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->rx_cnt; wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->rx_cnt;
u32WidsCount++; u32WidsCount++;
strWIDList[u32WidsCount].id = WID_FAILED_COUNT; wid_list[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT; wid_list[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32); wid_list[u32WidsCount].size = sizeof(u32);
strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->tx_fail_cnt; wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->tx_fail_cnt;
u32WidsCount++; u32WidsCount++;
result = wilc_send_config_pkt(vif, GET_CFG, strWIDList, result = wilc_send_config_pkt(vif, GET_CFG, wid_list,
u32WidsCount, u32WidsCount,
wilc_get_vif_idx(vif)); wilc_get_vif_idx(vif));
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7