rkwifi: dhd_config: fix compilation warning

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
index 1809b14c4862b59a3b246b897b011e261469cf14..c15b95aff6c619f7ee29d6e5e9a0962f1166c614 100755 (executable)
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c
@@ -14,25 +14,25 @@
 #include <dhd_config.h>\r
 #include <dhd_dbg.h>\r
 \r
-/* message levels */
+/* message levels */\r
 #define CONFIG_ERROR_LEVEL     0x0001\r
 #define CONFIG_TRACE_LEVEL     0x0002\r
-
+\r
 uint config_msg_level = CONFIG_ERROR_LEVEL;\r
-
+\r
 #define CONFIG_ERROR(x) \\r
-       do { \
+       do { \\r
                if (config_msg_level & CONFIG_ERROR_LEVEL) { \\r
                        printk(KERN_ERR "CONFIG-ERROR) ");      \\r
-                       printk x; \
-               } \
-       } while (0)
+                       printk x; \\r
+               } \\r
+       } while (0)\r
 #define CONFIG_TRACE(x) \\r
-       do { \
+       do { \\r
                if (config_msg_level & CONFIG_TRACE_LEVEL) { \\r
                        printk(KERN_ERR "CONFIG-TRACE) ");      \\r
-                       printk x; \
-               } \
+                       printk x; \\r
+               } \\r
        } while (0)\r
 \r
 #define MAXSZ_BUF              1000\r
@@ -149,11 +149,11 @@ const static char *bcm4356a2_pcie_ag_fw_name[] = {
 };\r
 #endif\r
 \r
-#define htod32(i) i
-#define htod16(i) i
-#define dtoh32(i) i
-#define dtoh16(i) i
-#define htodchanspec(i) i
+#define htod32(i) i\r
+#define htod16(i) i\r
+#define dtoh32(i) i\r
+#define dtoh16(i) i\r
+#define htodchanspec(i) i\r
 #define dtohchanspec(i) i\r
 \r
 #ifdef BCMSDIO\r
@@ -582,10 +582,10 @@ dhd_conf_fix_country(dhd_pub_t *dhd)
        if (!(dhd && dhd->conf)) {\r
                return bcmerror;\r
        }\r
-
+\r
        memset(valid_chan_list, 0, sizeof(valid_chan_list));\r
-       list = (wl_uint32_list_t *)(void *) valid_chan_list;
-       list->count = htod32(WL_NUMCHANNELS);
+       list = (wl_uint32_list_t *)(void *) valid_chan_list;\r
+       list->count = htod32(WL_NUMCHANNELS);\r
        if ((bcmerror = dhd_wl_ioctl_cmd(dhd, WLC_GET_VALID_CHANNELS, valid_chan_list, sizeof(valid_chan_list), FALSE, 0)) < 0) {\r
                CONFIG_ERROR(("%s: get channels failed with %d\n", __FUNCTION__, bcmerror));\r
        }\r
@@ -721,22 +721,22 @@ dhd_conf_get_wme(dhd_pub_t *dhd, edcf_acparam_t *acp)
        CONFIG_TRACE(("%s: BK: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
-               (int)sizeof(acp)));\r
+               sizeof(acp)));\r
        acparam = &acp[AC_BE];\r
        CONFIG_TRACE(("%s: BE: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
-               (int)sizeof(acp)));\r
+               sizeof(acp)));\r
        acparam = &acp[AC_VI];\r
        CONFIG_TRACE(("%s: VI: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
-               (int)sizeof(acp)));\r
+               sizeof(acp)));\r
        acparam = &acp[AC_VO];\r
        CONFIG_TRACE(("%s: VO: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK,\r
                acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
-               (int)sizeof(acp)));\r
+               sizeof(acp)));\r
 \r
        return;\r
 }\r
@@ -772,7 +772,7 @@ dhd_conf_update_wme(dhd_pub_t *dhd, edcf_acparam_t *acparam_cur, int aci)
        CONFIG_TRACE(("%s: mod aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__,\r
                acp->ACI, acp->ACI&EDCF_AIFSN_MASK,\r
                acp->ECW&EDCF_ECWMIN_MASK, (acp->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT,\r
-               (int)sizeof(edcf_acparam_t)));\r
+               sizeof(edcf_acparam_t)));\r
 \r
        /*\r
        * Now use buf as an output buffer.\r
@@ -1173,8 +1173,8 @@ dhd_conf_read_log_level(dhd_pub_t *dhd, char *bufp, uint len)
                dhd_console_ms = (int)simple_strtol(pick, NULL, 0);\r
                printf("%s: dhd_console_ms = 0x%X\n", __FUNCTION__, dhd_console_ms);\r
        }\r
-}
-
+}\r
+\r
 void\r
 dhd_conf_read_wme_ac_params(dhd_pub_t *dhd, char *bufp, uint len)\r
 {\r
@@ -1399,7 +1399,7 @@ dhd_conf_read_config(dhd_pub_t *dhd, char *conf_path)
                /* Process log_level */\r
                dhd_conf_read_log_level(dhd, bufp, len);\r
                dhd_conf_read_roam_params(dhd, bufp, len);\r
-               dhd_conf_read_wme_ac_params(dhd, bufp, len);
+               dhd_conf_read_wme_ac_params(dhd, bufp, len);\r
 \r
                /* Process fw_by_mac */\r
                memset(pick, 0, MAXSZ_BUF);\r
@@ -1647,7 +1647,7 @@ dhd_conf_read_config(dhd_pub_t *dhd, char *conf_path)
                len_val = process_config_vars(bufp, len, pick, "bus:txglom=");\r
                if (len_val) {\r
                        conf->bus_txglom = (int)simple_strtol(pick, NULL, 10);\r
-                       printf("%s: bus:txglom = %d\n", __FUNCTION__, conf->bus_txglom);
+                       printf("%s: bus:txglom = %d\n", __FUNCTION__, conf->bus_txglom);\r
                }\r
 \r
                /* Process ampdu_ba_wsize parameters */\r
@@ -1844,9 +1844,9 @@ dhd_conf_preinit(dhd_pub_t *dhd)
        conf->roam_delta[0] = 15;\r
 #endif\r
        conf->roam_delta[1] = WLC_BAND_ALL;\r
-#ifdef FULL_ROAMING_SCAN_PERIOD_60_SEC
+#ifdef FULL_ROAMING_SCAN_PERIOD_60_SEC\r
        conf->fullroamperiod = 60;\r
-#else /* FULL_ROAMING_SCAN_PERIOD_60_SEC */
+#else /* FULL_ROAMING_SCAN_PERIOD_60_SEC */\r
        conf->fullroamperiod = 120;\r
 #endif /* FULL_ROAMING_SCAN_PERIOD_60_SEC */\r
 #ifdef CUSTOM_KEEP_ALIVE_SETTING\r
@@ -1881,10 +1881,10 @@ dhd_conf_preinit(dhd_pub_t *dhd)
                conf->disable_proptx = 1;\r
                conf->use_rxchain = 0;\r
        }\r
-    if (conf->chip == BCM43430_CHIP_ID) {
-        conf->use_rxchain = 0;
-        conf->bus_rxglom = FALSE;
-    }
+    if (conf->chip == BCM43430_CHIP_ID) {\r
+        conf->use_rxchain = 0;\r
+        conf->bus_rxglom = FALSE;\r
+    }\r
        if (conf->chip == BCM4339_CHIP_ID) {\r
                conf->txbf = 1;\r
        }\r