staging: rtl8192e: Remove conditions for RF_2T4R

Remove conditions for RF_2T4R because hardware that uses RF_2T4R does not
exist.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/af7dcd620fdad63b2f324d626f1c97601895823a.1677955334.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index 1e307789ee93197af5a2352323620da6e0308d10..8edfaaeda9103b5d8a9329321080583428b53046 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -353,8 +353,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev)
 
                        if (tempval&0x80)
                                priv->rf_type = RF_1T2R;
-                       else
-                               priv->rf_type = RF_2T4R;
+
                } else {
                        priv->eeprom_legacy_ht_tx_pwr_diff = 0x04;
                }

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 385ceb3a96365c4e264399c7e34403ded3f4421e..35ca01ab65ff9fb8dba2babb0788efb1ff056036 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -52,9 +52,7 @@ u8 rtl92e_is_legal_rf_path(struct net_device *dev, u32 eRFPath)
        u8 ret = 1;
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       if (priv->rf_type == RF_2T4R)
-               ret = 0;
-       else if (priv->rf_type == RF_1T2R) {
+       if (priv->rf_type == RF_1T2R) {
                if (eRFPath == RF90_PATH_A || eRFPath == RF90_PATH_B)
                        ret = 1;
                else if (eRFPath == RF90_PATH_C || eRFPath == RF90_PATH_D)
@@ -531,12 +529,7 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev)
        _rtl92e_phy_config_bb(dev, BB_CONFIG_AGC_TAB);
 
        if (priv->ic_cut  > VERSION_8190_BD) {
-               if (priv->rf_type == RF_2T4R)
-                       dwRegValue = priv->antenna_tx_pwr_diff[2] << 8 |
-                                     priv->antenna_tx_pwr_diff[1] << 4 |
-                                     priv->antenna_tx_pwr_diff[0];
-               else
-                       dwRegValue = 0x0;
+               dwRegValue = 0x0;
                rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,
                                  (bXBTxAGC|bXCTxAGC|bXDTxAGC), dwRegValue);
 
@@ -587,16 +580,8 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 channel)
        if (priv->epromtype == EEPROM_93C46) {
                powerlevel = priv->tx_pwr_level_cck[channel - 1];
                powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1];
-       } else if (priv->epromtype == EEPROM_93C56) {
-               if (priv->rf_type == RF_2T4R) {
-                       priv->antenna_tx_pwr_diff[2] = 0;
-                       priv->antenna_tx_pwr_diff[1] = 0;
-                       priv->antenna_tx_pwr_diff[0] = 0;
-
-                       rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage,
-                                         (bXBTxAGC | bXCTxAGC | bXDTxAGC), 0);
-               }
        }
+
        switch (priv->rf_chip) {
        case RF_8225:
                break;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index d8455b23e555441a071cbad3085aebda6b9ebed9..a1bd119b89832b32417a9625f7790835576fe46f 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -297,14 +297,7 @@ void rtl92e_init_adaptive_rate(struct net_device *dev)
        pra->ping_rssi_thresh_for_ra = 15;
 
 
-       if (priv->rf_type == RF_2T4R) {
-               pra->upper_rssi_threshold_ratr          =       0x8f0f0000;
-               pra->middle_rssi_threshold_ratr         =       0x8f0ff000;
-               pra->low_rssi_threshold_ratr            =       0x8f0ff001;
-               pra->low_rssi_threshold_ratr_40M        =       0x8f0ff005;
-               pra->low_rssi_threshold_ratr_20M        =       0x8f0ff001;
-               pra->ping_rssi_ratr     =       0x0000000d;
-       } else if (priv->rf_type == RF_1T2R) {
+       if (priv->rf_type == RF_1T2R) {
                pra->upper_rssi_threshold_ratr          =       0x000fc000;
                pra->middle_rssi_threshold_ratr         =       0x000ff000;
                pra->low_rssi_threshold_ratr            =       0x000ff001;
@@ -518,47 +511,18 @@ static void _rtl92e_dm_tx_update_tssi_weak_signal(struct net_device *dev,
 {
        struct r8192_priv *p = rtllib_priv(dev);
 
-       if (RF_Type == RF_2T4R) {
-               if ((p->rfa_txpowertrackingindex > 0) &&
-                   (p->rfc_txpowertrackingindex > 0)) {
-                       p->rfa_txpowertrackingindex--;
-                       if (p->rfa_txpowertrackingindex_real > 4) {
-                               p->rfa_txpowertrackingindex_real--;
-                               rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                                 bMaskDWord,
-                                                 dm_tx_bb_gain[p->rfa_txpowertrackingindex_real]);
-                       }
-
-                       p->rfc_txpowertrackingindex--;
-                       if (p->rfc_txpowertrackingindex_real > 4) {
-                               p->rfc_txpowertrackingindex_real--;
-                               rtl92e_set_bb_reg(dev,
-                                                 rOFDM0_XCTxIQImbalance,
-                                                 bMaskDWord,
-                                                 dm_tx_bb_gain[p->rfc_txpowertrackingindex_real]);
-                       }
-               } else {
-                       rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[4]);
+       if (p->rfa_txpowertrackingindex > 0) {
+               p->rfa_txpowertrackingindex--;
+               if (p->rfa_txpowertrackingindex_real > 4) {
+                       p->rfa_txpowertrackingindex_real--;
                        rtl92e_set_bb_reg(dev,
-                                         rOFDM0_XCTxIQImbalance,
-                                         bMaskDWord, dm_tx_bb_gain[4]);
+                                         rOFDM0_XATxIQImbalance,
+                                         bMaskDWord,
+                                         dm_tx_bb_gain[p->rfa_txpowertrackingindex_real]);
                }
        } else {
-               if (p->rfa_txpowertrackingindex > 0) {
-                       p->rfa_txpowertrackingindex--;
-                       if (p->rfa_txpowertrackingindex_real > 4) {
-                               p->rfa_txpowertrackingindex_real--;
-                               rtl92e_set_bb_reg(dev,
-                                                 rOFDM0_XATxIQImbalance,
-                                                 bMaskDWord,
-                                                 dm_tx_bb_gain[p->rfa_txpowertrackingindex_real]);
-                       }
-               } else {
-                       rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                         bMaskDWord, dm_tx_bb_gain[4]);
-               }
+               rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
+                                 bMaskDWord, dm_tx_bb_gain[4]);
        }
 }
 
@@ -567,39 +531,16 @@ static void _rtl92e_dm_tx_update_tssi_strong_signal(struct net_device *dev,
 {
        struct r8192_priv *p = rtllib_priv(dev);
 
-       if (RF_Type == RF_2T4R) {
-               if ((p->rfa_txpowertrackingindex < TX_BB_GAIN_TABLE_LEN - 1) &&
-                   (p->rfc_txpowertrackingindex < TX_BB_GAIN_TABLE_LEN - 1)) {
-                       p->rfa_txpowertrackingindex++;
-                       p->rfa_txpowertrackingindex_real++;
-                       rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[p->rfa_txpowertrackingindex_real]);
-                       p->rfc_txpowertrackingindex++;
-                       p->rfc_txpowertrackingindex_real++;
-                       rtl92e_set_bb_reg(dev, rOFDM0_XCTxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[p->rfc_txpowertrackingindex_real]);
-               } else {
-                       rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]);
-                       rtl92e_set_bb_reg(dev, rOFDM0_XCTxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]);
-               }
+       if (p->rfa_txpowertrackingindex < (TX_BB_GAIN_TABLE_LEN - 1)) {
+               p->rfa_txpowertrackingindex++;
+               p->rfa_txpowertrackingindex_real++;
+               rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
+                                 bMaskDWord,
+                                 dm_tx_bb_gain[p->rfa_txpowertrackingindex_real]);
        } else {
-               if (p->rfa_txpowertrackingindex < (TX_BB_GAIN_TABLE_LEN - 1)) {
-                       p->rfa_txpowertrackingindex++;
-                       p->rfa_txpowertrackingindex_real++;
-                       rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[p->rfa_txpowertrackingindex_real]);
-               } else {
-                       rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
-                                         bMaskDWord,
-                                         dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]);
-               }
+               rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance,
+                                 bMaskDWord,
+                                 dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN - 1]);
        }
 }
 
@@ -705,13 +646,8 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev)
                        else
                                _rtl92e_dm_tx_update_tssi_strong_signal(dev, RF_Type);
 
-                       if (RF_Type == RF_2T4R) {
-                               priv->cck_present_attn_diff
-                                       = priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_default;
-                       } else {
-                               priv->cck_present_attn_diff
-                                       = priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
-                       }
+                       priv->cck_present_attn_diff
+                               = priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_default;
 
                        if (priv->current_chnl_bw == HT_CHANNEL_WIDTH_20)
                                priv->cck_present_attn =
@@ -1765,9 +1701,6 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_device *dev)
        static u8 disabled_rf_cnt, cck_Rx_Path_initialized;
        u8 update_cck_rx_path;
 
-       if (priv->rf_type != RF_2T4R)
-               return;
-
        if (!cck_Rx_Path_initialized) {
                dm_rx_path_sel_table.cck_rx_path = (rtl92e_readb(dev, 0xa07)&0xf);
                cck_Rx_Path_initialized = 1;

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 1152fbf4338377853d5b976f28f8afb90dca2848..8e5e29ce8f0d80c5f08b67a5b629b1fd2496e005 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -451,7 +451,6 @@ enum led_ctl_mode {
 
 enum rt_rf_type_def {
        RF_1T2R = 0,
-       RF_2T4R,
 };
 
 enum wireless_mode {