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>

1 files changed, 20 insertions, 20 deletions

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;
         }
 }