]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: wilc1000: rename enuScanEvent in CfgScanResult function
authorLeo Kim <leo.kim@atmel.com>
Thu, 19 Nov 2015 06:56:31 +0000 (15:56 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 18 Dec 2015 22:34:41 +0000 (14:34 -0800)
This patch renames enuScanEvent to scan_event that is
first argument of CfgScanResult function to avoid camelcase.
And, remove the relation comment.

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>
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

index 7905f37c241b3f17e220b6926a25357615859672..646beff5d73fab669ebb75961e523b9b06bb14d5 100644 (file)
@@ -419,7 +419,10 @@ static void add_network_to_shadow(tstrNetworkInfo *pstrNetworkInfo,
  *  @date
  *  @version   1.0
  */
-static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid, void *pJoinParams)
+static void CfgScanResult(enum scan_event scan_event,
+                         tstrNetworkInfo *pstrNetworkInfo,
+                         void *pUserVoid,
+                         void *pJoinParams)
 {
        struct wilc_priv *priv;
        struct wiphy *wiphy;
@@ -429,7 +432,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo *pstrNet
 
        priv = (struct wilc_priv *)pUserVoid;
        if (priv->bCfgScanning) {
-               if (enuScanEvent == SCAN_EVENT_NETWORK_FOUND) {
+               if (scan_event == SCAN_EVENT_NETWORK_FOUND) {
                        wiphy = priv->dev->ieee80211_ptr->wiphy;
 
                        if (!wiphy)
@@ -498,7 +501,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo *pstrNet
                                        }
                                }
                        }
-               } else if (enuScanEvent == SCAN_EVENT_DONE)    {
+               } else if (scan_event == SCAN_EVENT_DONE) {
                        PRINT_D(CFG80211_DBG, "Scan Done[%p]\n", priv->dev);
                        PRINT_D(CFG80211_DBG, "Refreshing Scan ...\n");
                        refresh_scan(priv, 1, false);
@@ -517,10 +520,7 @@ static void CfgScanResult(enum scan_event enuScanEvent, tstrNetworkInfo *pstrNet
                                priv->pstrScanReq = NULL;
                        }
                        up(&(priv->hSemScanReq));
-
-               }
-               /*Aborting any scan operation during mac close*/
-               else if (enuScanEvent == SCAN_EVENT_ABORTED) {
+               } else if (scan_event == SCAN_EVENT_ABORTED) {
                        down(&(priv->hSemScanReq));
 
                        PRINT_D(CFG80211_DBG, "Scan Aborted\n");