rtlwifi: rtl8723{be,ae}: Remove CamelCase variables

If a macro is in CamelCase, it it converted to upper case. Variables
and routine names are converted to lower case.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
index 586fe70..42958df 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/def.h
@@ -94,7 +94,7 @@
 #define IS_VENDOR_8723A_B_CUT(version) ((IS_8723_SERIES(version))\
                ? ((GET_CVID_CUT_VERSION(version) == \
                B_CUT_VERSION) ? true : false) : false)
-#define IS_81xxC_VENDOR_UMC_B_CUT(version)     ((IS_CHIP_VENDOR_UMC(version))\
+#define IS_81XXC_VENDOR_UMC_B_CUT(version)     ((IS_CHIP_VENDOR_UMC(version))\
                ? ((GET_CVID_CUT_VERSION(version) == \
                B_CUT_VERSION) ? true : false) : false)
 

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
index ddebedb..6bab162 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/hw.c
@@ -676,7 +676,7 @@ static bool _rtl8712e_init_mac(struct ieee80211_hw *hw)
 
        /* HW Power on sequence */
        if (!rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-               PWR_INTF_PCI_MSK, Rtl8723_NIC_ENABLE_FLOW))
+               PWR_INTF_PCI_MSK, RTL8723_NIC_ENABLE_FLOW))
                return false;
 
        bytetmp = rtl_read_byte(rtlpriv, REG_PCIE_CTRL_REG+2);
@@ -966,7 +966,7 @@ int rtl8723e_hw_init(struct ieee80211_hw *hw)
        if (IS_VENDOR_UMC_A_CUT(rtlhal->version)) {
                rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1, MASKDWORD, 0x30255);
                rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G2, MASKDWORD, 0x50a00);
-       } else if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
+       } else if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
                rtl_set_rfreg(hw, RF90_PATH_A, 0x0C, MASKDWORD, 0x894AE);
                rtl_set_rfreg(hw, RF90_PATH_A, 0x0A, MASKDWORD, 0x1AF31);
                rtl_set_rfreg(hw, RF90_PATH_A, RF_IPA, MASKDWORD, 0x8F425);
@@ -1262,7 +1262,7 @@ static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
        /* Combo (PCIe + USB) Card and PCIe-MF Card */
        /* 1. Run LPS WL RFOFF flow */
        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-                                PWR_INTF_PCI_MSK, Rtl8723_NIC_LPS_ENTER_FLOW);
+                                PWR_INTF_PCI_MSK, RTL8723_NIC_LPS_ENTER_FLOW);
 
        /* 2. 0x1F[7:0] = 0 */
        /* turn off RF */
@@ -1282,7 +1282,7 @@ static void _rtl8723e_poweroff_adapter(struct ieee80211_hw *hw)
 
        /* HW card disable configuration. */
        rtl_hal_pwrseqcmdparsing(rtlpriv, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK,
-               PWR_INTF_PCI_MSK, Rtl8723_NIC_DISABLE_FLOW);
+               PWR_INTF_PCI_MSK, RTL8723_NIC_DISABLE_FLOW);
 
        /* Reset MCU IO Wrapper */
        u1b_tmp = rtl_read_byte(rtlpriv, REG_RSV_CTRL + 1);

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
index b4f7b07..54a3aec 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.c
@@ -883,7 +883,7 @@ static void _rtl8723e_phy_sw_rf_seting(struct ieee80211_hw *hw, u8 channel)
        struct rtl_phy *rtlphy = &rtlpriv->phy;
        struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-       if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version)) {
+       if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version)) {
                if (channel == 6 && rtlphy->current_chan_bw ==
                                HT_CHANNEL_WIDTH_20)
                        rtl_set_rfreg(hw, RF90_PATH_A, RF_RX_G1,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
index 6aa72b5..98bfe02 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h
@@ -26,7 +26,7 @@
 #define MAX_STALL_TIME                         50
 #define ANTENNADIVERSITYVALUE                  0x80
 #define MAX_TXPWR_IDX_NMODE_92S                        63
-#define Reset_Cnt_Limit                                3
+#define reset_cnt_limit                                3
 
 #define IQK_ADDA_REG_NUM                       16
 #define IQK_MAC_REG_NUM                                4

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
index c747c5e..d9247a8 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h
@@ -305,14 +305,14 @@ extern struct wlan_pwr_cfg rtl8723A_leave_lps_flow
                [RTL8723A_TRANS_LPS_TO_ACT_STEPS + RTL8723A_TRANS_END_STEPS];
 
 /* RTL8723 Power Configuration CMDs for PCIe interface */
-#define Rtl8723_NIC_PWR_ON_FLOW                rtl8723A_power_on_flow
-#define Rtl8723_NIC_RF_OFF_FLOW                rtl8723A_radio_off_flow
-#define Rtl8723_NIC_DISABLE_FLOW       rtl8723A_card_disable_flow
-#define Rtl8723_NIC_ENABLE_FLOW                rtl8723A_card_enable_flow
-#define Rtl8723_NIC_SUSPEND_FLOW       rtl8723A_suspend_flow
-#define Rtl8723_NIC_RESUME_FLOW                rtl8723A_resume_flow
-#define Rtl8723_NIC_PDN_FLOW           rtl8723A_hwpdn_flow
-#define Rtl8723_NIC_LPS_ENTER_FLOW     rtl8723A_enter_lps_flow
-#define Rtl8723_NIC_LPS_LEAVE_FLOW     rtl8723A_leave_lps_flow
+#define RTL8723_NIC_PWR_ON_FLOW                rtl8723A_power_on_flow
+#define RTL8723_NIC_RF_OFF_FLOW                rtl8723A_radio_off_flow
+#define RTL8723_NIC_DISABLE_FLOW       rtl8723A_card_disable_flow
+#define RTL8723_NIC_ENABLE_FLOW                rtl8723A_card_enable_flow
+#define RTL8723_NIC_SUSPEND_FLOW       rtl8723A_suspend_flow
+#define RTL8723_NIC_RESUME_FLOW                rtl8723A_resume_flow
+#define RTL8723_NIC_PDN_FLOW           rtl8723A_hwpdn_flow
+#define RTL8723_NIC_LPS_ENTER_FLOW     rtl8723A_enter_lps_flow
+#define RTL8723_NIC_LPS_LEAVE_FLOW     rtl8723A_leave_lps_flow
 
 #endif

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
index 0d9c0cc..4b37041 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
@@ -153,7 +153,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
                return 1;
        }
 
-       if (IS_81xxC_VENDOR_UMC_B_CUT(rtlhal->version))
+       if (IS_81XXC_VENDOR_UMC_B_CUT(rtlhal->version))
                fw_name = "rtlwifi/rtl8723fw_B.bin";
 
        rtlpriv->max_fw_size = 0x6000;

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
index 7a9891a..979e5bf 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c
@@ -297,12 +297,12 @@ void rtl8723be_get_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                *((enum rf_pwrstate *)(val)) = ppsc->rfpwr_state;
                break;
        case HW_VAR_FWLPS_RF_ON:{
-               enum rf_pwrstate rfState;
+               enum rf_pwrstate rfstate;
                u32 val_rcr;
 
                rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_RF_STATE,
-                                             (u8 *)(&rfState));
-               if (rfState == ERFOFF) {
+                                             (u8 *)(&rfstate));
+               if (rfstate == ERFOFF) {
                        *((bool *)(val)) = true;
                } else {
                        val_rcr = rtl_read_dword(rtlpriv, REG_RCR);
@@ -742,10 +742,10 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
        struct rtl_priv *rtlpriv = rtl_priv(hw);
        unsigned short i;
        u8 txpktbuf_bndy;
-       u8 maxPage;
+       u8 maxpage;
        bool status;
 
-       maxPage = 255;
+       maxpage = 255;
        txpktbuf_bndy = 245;
 
        rtl_write_dword(rtlpriv, REG_TRXFF_BNDY,
@@ -770,13 +770,13 @@ static bool _rtl8723be_llt_table_init(struct ieee80211_hw *hw)
        if (!status)
                return status;
 
-       for (i = txpktbuf_bndy; i < maxPage; i++) {
+       for (i = txpktbuf_bndy; i < maxpage; i++) {
                status = _rtl8723be_llt_write(hw, i, (i + 1));
                if (!status)
                        return status;
        }
 
-       status = _rtl8723be_llt_write(hw, maxPage, txpktbuf_bndy);
+       status = _rtl8723be_llt_write(hw, maxpage, txpktbuf_bndy);
        if (!status)
                return status;