rtlwifi: Modify some rtl8192ce routines for merging rtl8192cu

Modify some rtl8192ce routines for merging with rtl8192cu. In addition,
remove some usage of Hungarian notation.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 41 insertions, 41 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
index b08b7802f04..b4f1e4e6b73 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c
@@ -306,13 +306,13 @@ static void rtl92c_dm_initial_gain_multi_sta(struct ieee80211_hw *hw)
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         long rssi_strength = rtlpriv->dm.entry_min_undecoratedsmoothed_pwdb;
-        bool b_multi_sta = false;
+        bool multi_sta = false;
 
         if (mac->opmode == NL80211_IFTYPE_ADHOC)
-                b_multi_sta = true;
+                multi_sta = true;
 
-        if ((b_multi_sta == false) || (dm_digtable.cursta_connectctate !=
-                                       DIG_STA_DISCONNECT)) {
+        if ((multi_sta == false) || (dm_digtable.cursta_connectctate !=
+                                     DIG_STA_DISCONNECT)) {
                 binitialized = false;
                 dm_digtable.dig_ext_port_stage = DIG_EXT_PORT_STAGE_MAX;
                 return;
@@ -479,7 +479,7 @@ static void rtl92c_dm_dig(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        if (rtlpriv->dm.b_dm_initialgain_enable == false)
+        if (rtlpriv->dm.dm_initialgain_enable == false)
                 return;
         if (dm_digtable.dig_enable_flag == false)
                 return;
@@ -492,7 +492,7 @@ static void rtl92c_dm_init_dynamic_txpower(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        rtlpriv->dm.bdynamic_txpower_enable = false;
+        rtlpriv->dm.dynamic_txpower_enable = false;
 
         rtlpriv->dm.last_dtp_lvl = TXHIGHPWRLEVEL_NORMAL;
         rtlpriv->dm.dynamic_txhighpower_lvl = TXHIGHPWRLEVEL_NORMAL;
@@ -550,9 +550,9 @@ static void rtl92c_dm_pwdb_monitor(struct ieee80211_hw *hw)
 void rtl92c_dm_init_edca_turbo(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        rtlpriv->dm.bcurrent_turbo_edca = false;
-        rtlpriv->dm.bis_any_nonbepkts = false;
-        rtlpriv->dm.bis_cur_rdlstate = false;
+        rtlpriv->dm.current_turbo_edca = false;
+        rtlpriv->dm.is_any_nonbepkts = false;
+        rtlpriv->dm.is_cur_rdlstate = false;
 }
 
 static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
@@ -570,7 +570,7 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
                 goto dm_checkedcaturbo_exit;
 
         if (mac->link_state != MAC80211_LINKED) {
-                rtlpriv->dm.bcurrent_turbo_edca = false;
+                rtlpriv->dm.current_turbo_edca = false;
                 return;
         }
 
@@ -582,40 +582,40 @@ static void rtl92c_dm_check_edca_turbo(struct ieee80211_hw *hw)
                         edca_be_dl |= 0x005e0000;
         }
 
-        if ((!rtlpriv->dm.bis_any_nonbepkts) &&
-            (!rtlpriv->dm.b_disable_framebursting)) {
+        if ((!rtlpriv->dm.is_any_nonbepkts) &&
+            (!rtlpriv->dm.disable_framebursting)) {
                 cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok_cnt;
                 cur_rxok_cnt = rtlpriv->stats.rxbytesunicast - last_rxok_cnt;
                 if (cur_rxok_cnt > 4 * cur_txok_cnt) {
-                        if (!rtlpriv->dm.bis_cur_rdlstate ||
-                            !rtlpriv->dm.bcurrent_turbo_edca) {
+                        if (!rtlpriv->dm.is_cur_rdlstate ||
+                            !rtlpriv->dm.current_turbo_edca) {
                                 rtl_write_dword(rtlpriv,
                                                 REG_EDCA_BE_PARAM,
                                                 edca_be_dl);
-                                rtlpriv->dm.bis_cur_rdlstate = true;
+                                rtlpriv->dm.is_cur_rdlstate = true;
                         }
                 } else {
-                        if (rtlpriv->dm.bis_cur_rdlstate ||
-                            !rtlpriv->dm.bcurrent_turbo_edca) {
+                        if (rtlpriv->dm.is_cur_rdlstate ||
+                            !rtlpriv->dm.current_turbo_edca) {
                                 rtl_write_dword(rtlpriv,
                                                 REG_EDCA_BE_PARAM,
                                                 edca_be_ul);
-                                rtlpriv->dm.bis_cur_rdlstate = false;
+                                rtlpriv->dm.is_cur_rdlstate = false;
                         }
                 }
-                rtlpriv->dm.bcurrent_turbo_edca = true;
+                rtlpriv->dm.current_turbo_edca = true;
         } else {
-                if (rtlpriv->dm.bcurrent_turbo_edca) {
+                if (rtlpriv->dm.current_turbo_edca) {
                         u8 tmp = AC0_BE;
                         rtlpriv->cfg->ops->set_hw_reg(hw,
                                                       HW_VAR_AC_PARAM,
                                                       (u8 *) (&tmp));
-                        rtlpriv->dm.bcurrent_turbo_edca = false;
+                        rtlpriv->dm.current_turbo_edca = false;
                 }
         }
 
 dm_checkedcaturbo_exit:
-        rtlpriv->dm.bis_any_nonbepkts = false;
+        rtlpriv->dm.is_any_nonbepkts = false;
         last_txok_cnt = rtlpriv->stats.txbytesunicast;
         last_rxok_cnt = rtlpriv->stats.rxbytesunicast;
 }
@@ -636,7 +636,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
         u8 txpwr_level[2] = {0, 0};
         u8 ofdm_min_index = 6, rf;
 
-        rtlpriv->dm.btxpower_trackingInit = true;
+        rtlpriv->dm.txpower_trackingInit = true;
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
                  ("rtl92c_dm_txpower_tracking_callback_thermalmeter\n"));
 
@@ -696,7 +696,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                     rtl_get_bbreg(hw, RCCK0_TXFILTER2, MASKDWORD) & MASKCCK;
 
                 for (i = 0; i < CCK_TABLE_LENGTH; i++) {
-                        if (rtlpriv->dm.b_cck_inch14) {
+                        if (rtlpriv->dm.cck_inch14) {
                                 if (memcmp((void *)&temp_cck,
                                            (void *)&cckswing_table_ch14[i][2],
                                            4) == 0) {
@@ -708,7 +708,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                                   "cck_index=0x%x, ch 14 %d\n",
                                                   RCCK0_TXFILTER2, temp_cck,
                                                   cck_index_old,
-                                                  rtlpriv->dm.b_cck_inch14));
+                                                  rtlpriv->dm.cck_inch14));
                                         break;
                                 }
                         } else {
@@ -724,7 +724,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                                   "cck_index=0x%x, ch14 %d\n",
                                                   RCCK0_TXFILTER2, temp_cck,
                                                   cck_index_old,
-                                                  rtlpriv->dm.b_cck_inch14));
+                                                  rtlpriv->dm.cck_inch14));
                                         break;
                                 }
                         }
@@ -937,7 +937,7 @@ static void rtl92c_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw
                                               BIT(31) | BIT(29), 0x00);
                         }
 
-                        if (!rtlpriv->dm.b_cck_inch14) {
+                        if (!rtlpriv->dm.cck_inch14) {
                                 rtl_write_byte(rtlpriv, 0xa22,
                                                cckswing_table_ch1ch13[cck_index]
                                                [0]);
@@ -1057,12 +1057,12 @@ static void rtl92c_dm_initialize_txpower_tracking_thermalmeter(
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
 
-        rtlpriv->dm.btxpower_tracking = true;
-        rtlpriv->dm.btxpower_trackingInit = false;
+        rtlpriv->dm.txpower_tracking = true;
+        rtlpriv->dm.txpower_trackingInit = false;
 
         RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD,
-                 ("pMgntInfo->btxpower_tracking = %d\n",
-                  rtlpriv->dm.btxpower_tracking));
+                 ("pMgntInfo->txpower_tracking = %d\n",
+                  rtlpriv->dm.txpower_tracking));
 }
 
 static void rtl92c_dm_initialize_txpower_tracking(struct ieee80211_hw *hw)
@@ -1081,7 +1081,7 @@ static void rtl92c_dm_check_txpower_tracking_thermal_meter(
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         static u8 tm_trigger;
 
-        if (!rtlpriv->dm.btxpower_tracking)
+        if (!rtlpriv->dm.txpower_tracking)
                 return;
 
         if (!tm_trigger) {
@@ -1113,9 +1113,9 @@ void rtl92c_dm_init_rate_adaptive_mask(struct ieee80211_hw *hw)
         p_ra->pre_ratr_state = DM_RATR_STA_INIT;
 
         if (rtlpriv->dm.dm_type == DM_TYPE_BYDRIVER)
-                rtlpriv->dm.b_useramask = true;
+                rtlpriv->dm.useramask = true;
         else
-                rtlpriv->dm.b_useramask = false;
+                rtlpriv->dm.useramask = false;
 
 }
 
@@ -1133,7 +1133,7 @@ static void rtl92c_dm_refresh_rate_adaptive_mask(struct ieee80211_hw *hw)
                 return;
         }
 
-        if (!rtlpriv->dm.b_useramask) {
+        if (!rtlpriv->dm.useramask) {
                 RT_TRACE(rtlpriv, COMP_RATE, DBG_LOUD,
                         ("<---- driver does not control rate adaptive mask\n"));
                 return;
@@ -1365,16 +1365,16 @@ void rtl92c_dm_watchdog(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
-        bool b_fw_current_inpsmode = false;
-        bool b_fw_ps_awake = true;
+        bool fw_current_inpsmode = false;
+        bool fw_ps_awake = true;
 
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FW_PSMODE_STATUS,
-                                      (u8 *) (&b_fw_current_inpsmode));
+                                      (u8 *) (&fw_current_inpsmode));
         rtlpriv->cfg->ops->get_hw_reg(hw, HW_VAR_FWLPS_RF_ON,
-                                      (u8 *) (&b_fw_ps_awake));
+                                      (u8 *) (&fw_ps_awake));
 
-        if ((ppsc->rfpwr_state == ERFON) && ((!b_fw_current_inpsmode) &&
-                                             b_fw_ps_awake)
+        if ((ppsc->rfpwr_state == ERFON) && ((!fw_current_inpsmode) &&
+                                             fw_ps_awake)
             && (!ppsc->rfchange_inprogress)) {
                 rtl92c_dm_pwdb_monitor(hw);
                 rtl92c_dm_dig(hw);