{
        s32 result = 0;
        struct wid wid_list[8];
-       u32 u32WidsCount = 0, dummyval = 0;
+       u32 wid_cnt = 0, dummyval = 0;
        u8 *pu8CurrByte = NULL;
        struct join_bss_param *ptstrJoinBssParam;
        struct host_if_drv *hif_drv = vif->hif_drv;
        hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
        hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg;
 
-       wid_list[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
-       wid_list[u32WidsCount].type = WID_INT;
-       wid_list[u32WidsCount].size = sizeof(u32);
-       wid_list[u32WidsCount].val = (s8 *)(&(dummyval));
-       u32WidsCount++;
+       wid_list[wid_cnt].id = WID_SUCCESS_FRAME_COUNT;
+       wid_list[wid_cnt].type = WID_INT;
+       wid_list[wid_cnt].size = sizeof(u32);
+       wid_list[wid_cnt].val = (s8 *)(&(dummyval));
+       wid_cnt++;
 
-       wid_list[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
-       wid_list[u32WidsCount].type = WID_INT;
-       wid_list[u32WidsCount].size = sizeof(u32);
-       wid_list[u32WidsCount].val = (s8 *)(&(dummyval));
-       u32WidsCount++;
+       wid_list[wid_cnt].id = WID_RECEIVED_FRAGMENT_COUNT;
+       wid_list[wid_cnt].type = WID_INT;
+       wid_list[wid_cnt].size = sizeof(u32);
+       wid_list[wid_cnt].val = (s8 *)(&(dummyval));
+       wid_cnt++;
 
-       wid_list[u32WidsCount].id = WID_FAILED_COUNT;
-       wid_list[u32WidsCount].type = WID_INT;
-       wid_list[u32WidsCount].size = sizeof(u32);
-       wid_list[u32WidsCount].val = (s8 *)(&(dummyval));
-       u32WidsCount++;
+       wid_list[wid_cnt].id = WID_FAILED_COUNT;
+       wid_list[wid_cnt].type = WID_INT;
+       wid_list[wid_cnt].size = sizeof(u32);
+       wid_list[wid_cnt].val = (s8 *)(&(dummyval));
+       wid_cnt++;
 
        {
-               wid_list[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
-               wid_list[u32WidsCount].type = WID_BIN_DATA;
-               wid_list[u32WidsCount].val = hif_drv->usr_conn_req.ies;
-               wid_list[u32WidsCount].size = hif_drv->usr_conn_req.ies_len;
-               u32WidsCount++;
+               wid_list[wid_cnt].id = WID_INFO_ELEMENT_ASSOCIATE;
+               wid_list[wid_cnt].type = WID_BIN_DATA;
+               wid_list[wid_cnt].val = hif_drv->usr_conn_req.ies;
+               wid_list[wid_cnt].size = hif_drv->usr_conn_req.ies_len;
+               wid_cnt++;
 
                if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
                        info_element_size = hif_drv->usr_conn_req.ies_len;
                               info_element_size);
                }
        }
-       wid_list[u32WidsCount].id = (u16)WID_11I_MODE;
-       wid_list[u32WidsCount].type = WID_CHAR;
-       wid_list[u32WidsCount].size = sizeof(char);
-       wid_list[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.security;
-       u32WidsCount++;
+       wid_list[wid_cnt].id = (u16)WID_11I_MODE;
+       wid_list[wid_cnt].type = WID_CHAR;
+       wid_list[wid_cnt].size = sizeof(char);
+       wid_list[wid_cnt].val = (s8 *)&hif_drv->usr_conn_req.security;
+       wid_cnt++;
 
        if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
                mode_11i = hif_drv->usr_conn_req.security;
 
-       wid_list[u32WidsCount].id = (u16)WID_AUTH_TYPE;
-       wid_list[u32WidsCount].type = WID_CHAR;
-       wid_list[u32WidsCount].size = sizeof(char);
-       wid_list[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.auth_type;
-       u32WidsCount++;
+       wid_list[wid_cnt].id = (u16)WID_AUTH_TYPE;
+       wid_list[wid_cnt].type = WID_CHAR;
+       wid_list[wid_cnt].size = sizeof(char);
+       wid_list[wid_cnt].val = (s8 *)&hif_drv->usr_conn_req.auth_type;
+       wid_cnt++;
 
        if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
                auth_type = (u8)hif_drv->usr_conn_req.auth_type;
 
-       wid_list[u32WidsCount].id = (u16)WID_JOIN_REQ_EXTENDED;
-       wid_list[u32WidsCount].type = WID_STR;
-       wid_list[u32WidsCount].size = 112;
-       wid_list[u32WidsCount].val = kmalloc(wid_list[u32WidsCount].size, GFP_KERNEL);
+       wid_list[wid_cnt].id = (u16)WID_JOIN_REQ_EXTENDED;
+       wid_list[wid_cnt].type = WID_STR;
+       wid_list[wid_cnt].size = 112;
+       wid_list[wid_cnt].val = kmalloc(wid_list[wid_cnt].size, GFP_KERNEL);
 
        if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
-               join_req_size = wid_list[u32WidsCount].size;
+               join_req_size = wid_list[wid_cnt].size;
                join_req = kmalloc(join_req_size, GFP_KERNEL);
        }
-       if (!wid_list[u32WidsCount].val) {
+       if (!wid_list[wid_cnt].val) {
                result = -EFAULT;
                goto ERRORHANDLER;
        }
 
-       pu8CurrByte = wid_list[u32WidsCount].val;
+       pu8CurrByte = wid_list[wid_cnt].val;
 
        if (pstrHostIFconnectAttr->ssid) {
                memcpy(pu8CurrByte, pstrHostIFconnectAttr->ssid, pstrHostIFconnectAttr->ssid_len);
                pu8CurrByte += sizeof(ptstrJoinBssParam->start_time);
        }
 
-       pu8CurrByte = wid_list[u32WidsCount].val;
-       u32WidsCount++;
+       pu8CurrByte = wid_list[wid_cnt].val;
+       wid_cnt++;
 
        if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
                memcpy(join_req, pu8CurrByte, join_req_size);
                       pstrHostIFconnectAttr->bssid, ETH_ALEN);
 
        result = wilc_send_config_pkt(vif, SET_CFG, wid_list,
-                                     u32WidsCount,
+                                     wid_cnt,
                                      wilc_get_vif_idx(vif));
        if (result) {
                netdev_err(vif->ndev, "failed to send config packet\n");
                                struct rf_info *pstrStatistics)
 {
        struct wid wid_list[5];
-       u32 u32WidsCount = 0, result = 0;
-
-       wid_list[u32WidsCount].id = WID_LINKSPEED;
-       wid_list[u32WidsCount].type = WID_CHAR;
-       wid_list[u32WidsCount].size = sizeof(char);
-       wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->link_speed;
-       u32WidsCount++;
-
-       wid_list[u32WidsCount].id = WID_RSSI;
-       wid_list[u32WidsCount].type = WID_CHAR;
-       wid_list[u32WidsCount].size = sizeof(char);
-       wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->rssi;
-       u32WidsCount++;
-
-       wid_list[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
-       wid_list[u32WidsCount].type = WID_INT;
-       wid_list[u32WidsCount].size = sizeof(u32);
-       wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->tx_cnt;
-       u32WidsCount++;
-
-       wid_list[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
-       wid_list[u32WidsCount].type = WID_INT;
-       wid_list[u32WidsCount].size = sizeof(u32);
-       wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->rx_cnt;
-       u32WidsCount++;
-
-       wid_list[u32WidsCount].id = WID_FAILED_COUNT;
-       wid_list[u32WidsCount].type = WID_INT;
-       wid_list[u32WidsCount].size = sizeof(u32);
-       wid_list[u32WidsCount].val = (s8 *)&pstrStatistics->tx_fail_cnt;
-       u32WidsCount++;
+       u32 wid_cnt = 0, result = 0;
+
+       wid_list[wid_cnt].id = WID_LINKSPEED;
+       wid_list[wid_cnt].type = WID_CHAR;
+       wid_list[wid_cnt].size = sizeof(char);
+       wid_list[wid_cnt].val = (s8 *)&pstrStatistics->link_speed;
+       wid_cnt++;
+
+       wid_list[wid_cnt].id = WID_RSSI;
+       wid_list[wid_cnt].type = WID_CHAR;
+       wid_list[wid_cnt].size = sizeof(char);
+       wid_list[wid_cnt].val = (s8 *)&pstrStatistics->rssi;
+       wid_cnt++;
+
+       wid_list[wid_cnt].id = WID_SUCCESS_FRAME_COUNT;
+       wid_list[wid_cnt].type = WID_INT;
+       wid_list[wid_cnt].size = sizeof(u32);
+       wid_list[wid_cnt].val = (s8 *)&pstrStatistics->tx_cnt;
+       wid_cnt++;
+
+       wid_list[wid_cnt].id = WID_RECEIVED_FRAGMENT_COUNT;
+       wid_list[wid_cnt].type = WID_INT;
+       wid_list[wid_cnt].size = sizeof(u32);
+       wid_list[wid_cnt].val = (s8 *)&pstrStatistics->rx_cnt;
+       wid_cnt++;
+
+       wid_list[wid_cnt].id = WID_FAILED_COUNT;
+       wid_list[wid_cnt].type = WID_INT;
+       wid_list[wid_cnt].size = sizeof(u32);
+       wid_list[wid_cnt].val = (s8 *)&pstrStatistics->tx_fail_cnt;
+       wid_cnt++;
 
        result = wilc_send_config_pkt(vif, GET_CFG, wid_list,
-                                     u32WidsCount,
+                                     wid_cnt,
                                      wilc_get_vif_idx(vif));
 
        if (result)