staging: wilc1000: rename u32RcvdChCount of struct user_scan_req

This patch renames u32RcvdChCount of struct user_scan_req to rcvd_ch_cnt
to avoid CamelCase naming convention.

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>

diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 3e7c6e41198226d159c9098bb7ea49c0c20ead1e..f465233fa60959c5fb5c99c6930698c1ede78907 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -843,7 +843,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
 
        PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
 
-       hif_drv->usr_scan_req.u32RcvdChCount = 0;
+       hif_drv->usr_scan_req.rcvd_ch_cnt = 0;
 
        strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
        strWIDList[u32WidsCount].type = WID_STR;
@@ -1414,7 +1414,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
                        goto done;
                }
 
-               for (i = 0; i < hif_drv->usr_scan_req.u32RcvdChCount; i++) {
+               for (i = 0; i < hif_drv->usr_scan_req.rcvd_ch_cnt; i++) {
                        if ((hif_drv->usr_scan_req.net_info[i].au8bssid) &&
                            (pstrNetworkInfo->au8bssid)) {
                                if (memcmp(hif_drv->usr_scan_req.net_info[i].au8bssid,
@@ -1434,15 +1434,15 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv *hif_drv,
                if (bNewNtwrkFound) {
                        PRINT_D(HOSTINF_DBG, "New network found\n");
 
-                       if (hif_drv->usr_scan_req.u32RcvdChCount < MAX_NUM_SCANNED_NETWORKS) {
-                               hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi = pstrNetworkInfo->s8rssi;
+                       if (hif_drv->usr_scan_req.rcvd_ch_cnt < MAX_NUM_SCANNED_NETWORKS) {
+                               hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].s8rssi = pstrNetworkInfo->s8rssi;
 
-                               if (hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid &&
+                               if (hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].au8bssid &&
                                    pstrNetworkInfo->au8bssid) {
-                                       memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid,
+                                       memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].au8bssid,
                                               pstrNetworkInfo->au8bssid, 6);
 
-                                       hif_drv->usr_scan_req.u32RcvdChCount++;
+                                       hif_drv->usr_scan_req.rcvd_ch_cnt++;
 
                                        pstrNetworkInfo->bNewNetwork = true;
                                        pJoinParams = host_int_ParseJoinBssParam(pstrNetworkInfo);

diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h
index f94bba69f15b0cd9de20b2d3dc5cf1ef367ec4bb..f824866c05a064ce0e8ba72bfae592a516523dec 100644 (file)
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -198,7 +198,7 @@ struct hidden_network {
 struct user_scan_req {
        wilc_scan_result scan_result;
        void *arg;
-       u32 u32RcvdChCount;
+       u32 rcvd_ch_cnt;
        struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS];
 };