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, 11 insertions, 23 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index 178462261c6f..c333dfd116b8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -1415,7 +1415,7 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 }
 
                 for (i = 0; i < 14; i++) {
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF(%d)-Ch(%d) [CCK / HT40_1S / HT40_2S] = "
                                 "[0x%x / 0x%x / 0x%x]\n", rf_path, i,
                                 rtlefuse->txpwrlevel_cck[rf_path][i],
@@ -1456,10 +1456,10 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                                     0xf0) >> 4);
                         }
 
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht20[%d] = 0x%x\n", rf_path, i,
                                 rtlefuse->pwrgroup_ht20[rf_path][i]);
-                        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                                 "RF-%d pwrgroup_ht40[%d] = 0x%x\n", rf_path, i,
                                 rtlefuse->pwrgroup_ht40[rf_path][i]);
                 }
@@ -1499,19 +1499,19 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
             rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][7];
 
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Ht20 to HT40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_ht20diff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-A Legacy to Ht40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_A][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Ht20 to HT40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_ht20diff[RF90_PATH_B][i]);
         for (i = 0; i < 14; i++)
-                RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+                RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                         "RF-B Legacy to HT40 Diff[%d] = 0x%x\n", i,
                         rtlefuse->txpwr_legacyhtdiff[RF90_PATH_B][i]);
 
@@ -1519,14 +1519,14 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->eeprom_regulatory = (hwinfo[RF_OPTION1] & 0x7);
         else
                 rtlefuse->eeprom_regulatory = 0;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "eeprom_regulatory = 0x%x\n", rtlefuse->eeprom_regulatory);
 
         if (!autoload_fail)
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = hwinfo[EEPROM_TSSI_A];
         else
                 rtlefuse->eeprom_tssi[RF90_PATH_A] = EEPROM_DEFAULT_TSSI;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "TSSI_A = 0x%x, TSSI_B = 0x%x\n",
                 rtlefuse->eeprom_tssi[RF90_PATH_A],
                 rtlefuse->eeprom_tssi[RF90_PATH_B]);
@@ -1541,7 +1541,7 @@ static void _rtl8723ae_read_txpower_info_from_hwpg(struct ieee80211_hw *hw,
                 rtlefuse->apk_thermalmeterignore = true;
 
         rtlefuse->thermalmeter[0] = rtlefuse->eeprom_thermalmeter;
-        RTPRINT(rtlpriv, FINIT, INIT_TxPower,
+        RTPRINT(rtlpriv, FINIT, INIT_TXPOWER,
                 "thermalmeter = 0x%x\n", rtlefuse->eeprom_thermalmeter);
 }
 
@@ -1749,19 +1749,7 @@ static void _rtl8723ae_hal_customized_behavior(struct ieee80211_hw *hw)
         struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
         struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 
-        switch (rtlhal->oem_id) {
-        case RT_CID_819x_HP:
-                pcipriv->ledctl.led_opendrain = true;
-                break;
-        case RT_CID_819x_Lenovo:
-        case RT_CID_DEFAULT:
-        case RT_CID_TOSHIBA:
-        case RT_CID_CCX:
-        case RT_CID_819x_Acer:
-        case RT_CID_WHQL:
-        default:
-                break;
-        }
+        pcipriv->ledctl.led_opendrain = true;
         RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
                  "RT Customized ID: 0x%02X\n", rtlhal->oem_id);
 }