From: Huang, Tao Date: Wed, 20 May 2015 07:34:03 +0000 (+0800) Subject: rkwifi: dhd_config: fix compilation warning X-Git-Tag: firefly_0821_release~4156 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=addd2754f35b166a2eb844129524e9b16efbd4ff;p=firefly-linux-kernel-4.4.55.git rkwifi: dhd_config: fix compilation warning Signed-off-by: Huang, Tao --- 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 1809b14c4862..c15b95aff6c6 100755 --- 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 #include -/* message levels */ +/* message levels */ #define CONFIG_ERROR_LEVEL 0x0001 #define CONFIG_TRACE_LEVEL 0x0002 - + uint config_msg_level = CONFIG_ERROR_LEVEL; - + #define CONFIG_ERROR(x) \ - do { \ + do { \ if (config_msg_level & CONFIG_ERROR_LEVEL) { \ printk(KERN_ERR "CONFIG-ERROR) "); \ - printk x; \ - } \ - } while (0) + printk x; \ + } \ + } while (0) #define CONFIG_TRACE(x) \ - do { \ + do { \ if (config_msg_level & CONFIG_TRACE_LEVEL) { \ printk(KERN_ERR "CONFIG-TRACE) "); \ - printk x; \ - } \ + printk x; \ + } \ } while (0) #define MAXSZ_BUF 1000 @@ -149,11 +149,11 @@ const static char *bcm4356a2_pcie_ag_fw_name[] = { }; #endif -#define htod32(i) i -#define htod16(i) i -#define dtoh32(i) i -#define dtoh16(i) i -#define htodchanspec(i) i +#define htod32(i) i +#define htod16(i) i +#define dtoh32(i) i +#define dtoh16(i) i +#define htodchanspec(i) i #define dtohchanspec(i) i #ifdef BCMSDIO @@ -582,10 +582,10 @@ dhd_conf_fix_country(dhd_pub_t *dhd) if (!(dhd && dhd->conf)) { return bcmerror; } - + memset(valid_chan_list, 0, sizeof(valid_chan_list)); - list = (wl_uint32_list_t *)(void *) valid_chan_list; - list->count = htod32(WL_NUMCHANNELS); + list = (wl_uint32_list_t *)(void *) valid_chan_list; + list->count = htod32(WL_NUMCHANNELS); if ((bcmerror = dhd_wl_ioctl_cmd(dhd, WLC_GET_VALID_CHANNELS, valid_chan_list, sizeof(valid_chan_list), FALSE, 0)) < 0) { CONFIG_ERROR(("%s: get channels failed with %d\n", __FUNCTION__, bcmerror)); } @@ -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__, acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK, acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT, - (int)sizeof(acp))); + sizeof(acp))); acparam = &acp[AC_BE]; CONFIG_TRACE(("%s: BE: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__, acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK, acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT, - (int)sizeof(acp))); + sizeof(acp))); acparam = &acp[AC_VI]; CONFIG_TRACE(("%s: VI: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__, acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK, acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT, - (int)sizeof(acp))); + sizeof(acp))); acparam = &acp[AC_VO]; CONFIG_TRACE(("%s: VO: aci %d aifsn %d ecwmin %d ecwmax %d size %zu\n", __FUNCTION__, acparam->ACI, acparam->ACI&EDCF_AIFSN_MASK, acparam->ECW&EDCF_ECWMIN_MASK, (acparam->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT, - (int)sizeof(acp))); + sizeof(acp))); return; } @@ -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__, acp->ACI, acp->ACI&EDCF_AIFSN_MASK, acp->ECW&EDCF_ECWMIN_MASK, (acp->ECW&EDCF_ECWMAX_MASK)>>EDCF_ECWMAX_SHIFT, - (int)sizeof(edcf_acparam_t))); + sizeof(edcf_acparam_t))); /* * Now use buf as an output buffer. @@ -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); printf("%s: dhd_console_ms = 0x%X\n", __FUNCTION__, dhd_console_ms); } -} - +} + void dhd_conf_read_wme_ac_params(dhd_pub_t *dhd, char *bufp, uint len) { @@ -1399,7 +1399,7 @@ dhd_conf_read_config(dhd_pub_t *dhd, char *conf_path) /* Process log_level */ dhd_conf_read_log_level(dhd, bufp, len); dhd_conf_read_roam_params(dhd, bufp, len); - dhd_conf_read_wme_ac_params(dhd, bufp, len); + dhd_conf_read_wme_ac_params(dhd, bufp, len); /* Process fw_by_mac */ memset(pick, 0, MAXSZ_BUF); @@ -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="); if (len_val) { conf->bus_txglom = (int)simple_strtol(pick, NULL, 10); - printf("%s: bus:txglom = %d\n", __FUNCTION__, conf->bus_txglom); + printf("%s: bus:txglom = %d\n", __FUNCTION__, conf->bus_txglom); } /* Process ampdu_ba_wsize parameters */ @@ -1844,9 +1844,9 @@ dhd_conf_preinit(dhd_pub_t *dhd) conf->roam_delta[0] = 15; #endif conf->roam_delta[1] = WLC_BAND_ALL; -#ifdef FULL_ROAMING_SCAN_PERIOD_60_SEC +#ifdef FULL_ROAMING_SCAN_PERIOD_60_SEC conf->fullroamperiod = 60; -#else /* FULL_ROAMING_SCAN_PERIOD_60_SEC */ +#else /* FULL_ROAMING_SCAN_PERIOD_60_SEC */ conf->fullroamperiod = 120; #endif /* FULL_ROAMING_SCAN_PERIOD_60_SEC */ #ifdef CUSTOM_KEEP_ALIVE_SETTING @@ -1881,10 +1881,10 @@ dhd_conf_preinit(dhd_pub_t *dhd) conf->disable_proptx = 1; conf->use_rxchain = 0; } - if (conf->chip == BCM43430_CHIP_ID) { - conf->use_rxchain = 0; - conf->bus_rxglom = FALSE; - } + if (conf->chip == BCM43430_CHIP_ID) { + conf->use_rxchain = 0; + conf->bus_rxglom = FALSE; + } if (conf->chip == BCM4339_CHIP_ID) { conf->txbf = 1; }