rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes required by adding rtl81988ee

This patch combines the remaining changes in the rtlwifi family to handle
the addition of rtl8188ee. A number of these changes eliminate some CamelCase
variable names, and other shorten common variable names so that long lines
in the new driver could be shortened.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: jcheung@suse.com
Cc: machen@suse.com
Cc: mmarek@suse.cz
Cc: zhiyuan_yang@realsil.com.cn
Signed-off-by: John W. Linville <linville@tuxdriver.com>

5 files changed, 41 insertions, 41 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
index 5251fb8a111e..19a765532603 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/dm.c
@@ -171,8 +171,8 @@ static void rtl92d_dm_diginit(struct ieee80211_hw *hw)
         de_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;
         de_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;
         de_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;
-        de_digtable->rx_gain_range_max = DM_DIG_FA_UPPER;
-        de_digtable->rx_gain_range_min = DM_DIG_FA_LOWER;
+        de_digtable->rx_gain_max = DM_DIG_FA_UPPER;
+        de_digtable->rx_gain_min = DM_DIG_FA_LOWER;
         de_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;
         de_digtable->back_range_max = DM_DIG_BACKOFF_MAX;
         de_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
@@ -444,8 +444,8 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                  "dm_DIG() Before: large_fa_hit=%d, forbidden_igi=%x\n",
                  de_digtable->large_fa_hit, de_digtable->forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 "dm_DIG() Before: Recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable->recover_cnt, de_digtable->rx_gain_range_min);
+                 "dm_DIG() Before: Recover_cnt=%d, rx_gain_min=%x\n",
+                 de_digtable->recover_cnt, de_digtable->rx_gain_min);
 
         /* deal with abnorally large false alarm */
         if (falsealm_cnt->cnt_all > 10000) {
@@ -459,9 +459,9 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                 }
                 if (de_digtable->large_fa_hit >= 3) {
                         if ((de_digtable->forbidden_igi + 1) > DM_DIG_MAX)
-                                de_digtable->rx_gain_range_min = DM_DIG_MAX;
+                                de_digtable->rx_gain_min = DM_DIG_MAX;
                         else
-                                de_digtable->rx_gain_range_min =
+                                de_digtable->rx_gain_min =
                                     (de_digtable->forbidden_igi + 1);
                         de_digtable->recover_cnt = 3600;        /* 3600=2hr */
                 }
@@ -475,12 +475,12 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                                     DM_DIG_FA_LOWER) {
                                         de_digtable->forbidden_igi =
                                                          DM_DIG_FA_LOWER;
-                                        de_digtable->rx_gain_range_min =
+                                        de_digtable->rx_gain_min =
                                                          DM_DIG_FA_LOWER;
 
                                 } else {
                                         de_digtable->forbidden_igi--;
-                                        de_digtable->rx_gain_range_min =
+                                        de_digtable->rx_gain_min =
                                             (de_digtable->forbidden_igi + 1);
                                 }
                         } else if (de_digtable->large_fa_hit == 3) {
@@ -492,13 +492,13 @@ static void rtl92d_dm_dig(struct ieee80211_hw *hw)
                  "dm_DIG() After: large_fa_hit=%d, forbidden_igi=%x\n",
                  de_digtable->large_fa_hit, de_digtable->forbidden_igi);
         RT_TRACE(rtlpriv, COMP_DIG, DBG_LOUD,
-                 "dm_DIG() After: recover_cnt=%d, rx_gain_range_min=%x\n",
-                 de_digtable->recover_cnt, de_digtable->rx_gain_range_min);
+                 "dm_DIG() After: recover_cnt=%d, rx_gain_min=%x\n",
+                 de_digtable->recover_cnt, de_digtable->rx_gain_min);
 
         if (value_igi > DM_DIG_MAX)
                 value_igi = DM_DIG_MAX;
-        else if (value_igi < de_digtable->rx_gain_range_min)
-                value_igi = de_digtable->rx_gain_range_min;
+        else if (value_igi < de_digtable->rx_gain_min)
+                value_igi = de_digtable->rx_gain_min;
         de_digtable->cur_igvalue = value_igi;
         rtl92d_dm_write_dig(hw);
         if (rtlpriv->rtlhal.current_bandtype != BAND_ON_5G)
@@ -1071,9 +1071,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         }
                         ele_d = (ofdmswing_table[(u8) ofdm_index[0]] &
                                                  0xFFC00000) >> 22;
-                        val_x = rtlphy->iqk_matrix_regsetting
+                        val_x = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][0];
-                        val_y = rtlphy->iqk_matrix_regsetting
+                        val_y = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][1];
                         if (val_x != 0) {
                                 if ((val_x & 0x00000200) != 0)
@@ -1175,9 +1175,9 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter(
                         if (is2t) {
                                 ele_d = (ofdmswing_table[(u8) ofdm_index[1]] &
                                                 0xFFC00000) >> 22;
-                                val_x = rtlphy->iqk_matrix_regsetting
+                                val_x = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][4];
-                                val_y = rtlphy->iqk_matrix_regsetting
+                                val_y = rtlphy->iqk_matrix
                                                 [indexforchannel].value[0][5];
                                 if (val_x != 0) {
                                         if ((val_x & 0x00000200) != 0)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index aa5b42521bb4..7dd8f6de0550 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -1183,7 +1183,7 @@ void rtl92d_linked_set_reg(struct ieee80211_hw *hw)
         u8 channel = rtlphy->current_channel;
 
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
-        if (!rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done) {
+        if (!rtlphy->iqk_matrix[indexforchannel].iqk_done) {
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_DMESG,
                          "Do IQK for channel:%d\n", channel);
                 rtl92d_phy_iq_calibrate(hw);
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 33041bd4da81..840bac5fa2f8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -2479,9 +2479,9 @@ void rtl92d_phy_iq_calibrate(struct ieee80211_hw *hw)
                                   rtlphy->current_channel);
 
                 for (i = 0; i < IQK_MATRIX_REG_NUM; i++)
-                        rtlphy->iqk_matrix_regsetting[indexforchannel].
+                        rtlphy->iqk_matrix[indexforchannel].
                                 value[0][i] = result[final_candidate][i];
-                rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done =
+                rtlphy->iqk_matrix[indexforchannel].iqk_done =
                         true;
 
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_MLME, DBG_LOUD,
@@ -2501,8 +2501,8 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
         indexforchannel = rtl92d_get_rightchnlplace_for_iqk(channel);
         RT_TRACE(rtlpriv, COMP_CMD, DBG_LOUD, "indexforchannel %d done %d\n",
                  indexforchannel,
-                 rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done);
-        if (0 && !rtlphy->iqk_matrix_regsetting[indexforchannel].iqk_done &&
+                 rtlphy->iqk_matrix[indexforchannel].iqk_done);
+        if (0 && !rtlphy->iqk_matrix[indexforchannel].iqk_done &&
                 rtlphy->need_iqk) {
                 /* Re Do IQK. */
                 RT_TRACE(rtlpriv, COMP_SCAN | COMP_INIT, DBG_LOUD,
@@ -2516,23 +2516,23 @@ void rtl92d_phy_reload_iqk_setting(struct ieee80211_hw *hw, u8 channel)
                         RT_TRACE(rtlpriv, COMP_SCAN, DBG_LOUD,
                                  "Just Read IQK Matrix reg for channel:%d....\n",
                                  channel);
-                        if ((rtlphy->iqk_matrix_regsetting[indexforchannel].
+                        if ((rtlphy->iqk_matrix[indexforchannel].
                              value[0] != NULL)
                                 /*&&(regea4 != 0) */)
                                 _rtl92d_phy_patha_fill_iqk_matrix(hw, true,
-                                        rtlphy->iqk_matrix_regsetting[
+                                        rtlphy->iqk_matrix[
                                         indexforchannel].value, 0,
-                                        (rtlphy->iqk_matrix_regsetting[
+                                        (rtlphy->iqk_matrix[
                                         indexforchannel].value[0][2] == 0));
                         if (IS_92D_SINGLEPHY(rtlhal->version)) {
-                                if ((rtlphy->iqk_matrix_regsetting[
+                                if ((rtlphy->iqk_matrix[
                                         indexforchannel].value[0][4] != 0)
                                         /*&&(regec4 != 0) */)
                                         _rtl92d_phy_pathb_fill_iqk_matrix(hw,
                                                 true,
-                                                rtlphy->iqk_matrix_regsetting[
+                                                rtlphy->iqk_matrix[
                                                 indexforchannel].value, 0,
-                                                (rtlphy->iqk_matrix_regsetting[
+                                                (rtlphy->iqk_matrix[
                                                 indexforchannel].value[0][6]
                                                 == 0));
                         }
@@ -2830,20 +2830,20 @@ void rtl92d_phy_reset_iqk_result(struct ieee80211_hw *hw)
 
         RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD,
                  "settings regs %d default regs %d\n",
-                 (int)(sizeof(rtlphy->iqk_matrix_regsetting) /
+                 (int)(sizeof(rtlphy->iqk_matrix) /
                        sizeof(struct iqk_matrix_regs)),
                  IQK_MATRIX_REG_NUM);
         /* 0xe94, 0xe9c, 0xea4, 0xeac, 0xeb4, 0xebc, 0xec4, 0xecc */
         for (i = 0; i < IQK_MATRIX_SETTINGS_NUM; i++) {
-                rtlphy->iqk_matrix_regsetting[i].value[0][0] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][2] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][4] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][6] = 0x100;
-                rtlphy->iqk_matrix_regsetting[i].value[0][1] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].value[0][3] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].value[0][5] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].value[0][7] = 0x0;
-                rtlphy->iqk_matrix_regsetting[i].iqk_done = false;
+                rtlphy->iqk_matrix[i].value[0][0] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][2] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][4] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][6] = 0x100;
+                rtlphy->iqk_matrix[i].value[0][1] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][3] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][5] = 0x0;
+                rtlphy->iqk_matrix[i].value[0][7] = 0x0;
+                rtlphy->iqk_matrix[i].iqk_done = false;
         }
 }
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
index ebb1d5f5e7b5..b7498c5bafc5 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/reg.h
@@ -543,7 +543,7 @@
 #define IMR_TIMEOUT1                    BIT(16)
 #define IMR_TXFOVW                      BIT(15)
 #define IMR_PSTIMEOUT                   BIT(14)
-#define IMR_BcnInt                      BIT(13)
+#define IMR_BCNINT                      BIT(13)
 #define IMR_RXFOVW                      BIT(12)
 #define IMR_RDU                         BIT(11)
 #define IMR_ATIMEND                     BIT(10)
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 03c6d18b2e07..c18c04bf0c13 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -166,7 +166,7 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
         /* for early mode */
-        rtlpriv->rtlhal.earlymode_enable = true;
+        rtlpriv->rtlhal.earlymode_enable = false;
         for (tid = 0; tid < 8; tid++)
                 skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
 
@@ -319,7 +319,7 @@ static struct rtl_hal_cfg rtl92de_hal_cfg = {
 
         .maps[RTL_IMR_TXFOVW] = IMR_TXFOVW,
         .maps[RTL_IMR_PSTIMEOUT] = IMR_PSTIMEOUT,
-        .maps[RTL_IMR_BcnInt] = IMR_BcnInt,
+        .maps[RTL_IMR_BCNINT] = IMR_BCNINT,
         .maps[RTL_IMR_RXFOVW] = IMR_RXFOVW,
         .maps[RTL_IMR_RDU] = IMR_RDU,
         .maps[RTL_IMR_ATIMEND] = IMR_ATIMEND,
@@ -333,7 +333,7 @@ static struct rtl_hal_cfg rtl92de_hal_cfg = {
         .maps[RTL_IMR_VIDOK] = IMR_VIDOK,
         .maps[RTL_IMR_VODOK] = IMR_VODOK,
         .maps[RTL_IMR_ROK] = IMR_ROK,
-        .maps[RTL_IBSS_INT_MASKS] = (IMR_BcnInt | IMR_TBDOK | IMR_TBDER),
+        .maps[RTL_IBSS_INT_MASKS] = (IMR_BCNINT | IMR_TBDOK | IMR_TBDER),
 
         .maps[RTL_RC_CCK_RATE1M] = DESC92_RATE1M,
         .maps[RTL_RC_CCK_RATE2M] = DESC92_RATE2M,