staging: rtl8192e: Remove unused RF90_PATH_C and ..D
cover staging: rtl8192e: Remove unused RF90_PATH_C and ..D
Remove unused RF90_PATH_C and RF90_PATH_D. Justification can be quite complex.
The following code lines are mandatory to keep in mind when reading the patches:
enum rf90_radio_path {
RF90_PATH_A = 0,
RF90_PATH_B = 1,
RF90_PATH_C = 2,
RF90_PATH_D = 3,
RF90_PATH_MAX
};Tested with rtl8192e
Transferred this patch over wlan connection of rtl8192e
Philipp Hortmann (2):
staging: rtl8192e: Replace RF90_PATH_C in test expression of for loop
staging: rtl8192e: Remove function rtl92e_is_legal_rf_path
.../staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 ------ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 18 ------------------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - 4 files changed, 1 insertion(+), 28 deletions(-)
Signature · 1 line
2.39.2
PATCH 1/2 staging: rtl8192e: Replace RF90_PATH_C in test expression of for loop
Replace RF90_PATH_C in test expression of the for loop with the variable that is commonly used. This avoids false hits when searching for usage of RF90_PATH_C and therefore improves readability.
--- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +1 -1
@@ -1514,7 +1514,7 @@ static void _rtl92e_process_phyinfo(struct r8192_priv *priv, u8 *buffer,return ;if (!prev_st->bIsCCK && prev_st->bPacketToSelf) { -for (rfpath =RF90_PATH_A ; rfpath <RF90_PATH_C ; rfpath++) { +for (rfpath =RF90_PATH_A ; rfpath < priv->num_total_rf_path; rfpath++) {if (!rtl92e_is_legal_rf_path (priv->rtllib->dev, rfpath))continue ;if (priv->stats.rx_rssi_percentage[rfpath] ==0 ) {
Signature · 1 line
2.39.2
PATCH 2/2 staging: rtl8192e: Remove function rtl92e_is_legal_rf_path
In reply to Philipp HortmannRemove function rtl92e_is_legal_rf_path that will always return 1. Reason is that the eRFPath is always 0 for RF90_PATH_A or 1 for RF90_PATH_B but never 2 or 3. In most usage cases this is easy to see but for the following functions that use rtl92e_is_legal_rf_path it is more difficult:rtl92e_set_rf_reg and rtl92e_get_rf_reg are used in:rtl92e_set_bandwidth (eRFPath only for 0 and 1) rtl92e_config_rf (eRFPath only for 0 and 1) _rtl92e_phy_switch_channel_step (eRFPath only for 0 and 1) _rtl92e_dm_check_tx_power_tracking_thermal (eRFPath only for 0) rtl92e_check_bb_and_rf is used in:rtl92e_config_rf (eRFPath only for 0 and 1) _rtl92e_bb_config_para_file (eRFPath only for 0) rtl92e_config_rf_path is used in:rtl92e_config_rf (eRFPath only for 0 and 1)
Remove dead code.
--- .../staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 ------ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 18 ------------------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - 4 files changed, 27 deletions(-)
drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +0 -6
@@ -22,9 +22,6 @@ void rtl92e_set_bandwidth(struct net_device *dev, }for (eRFPath =0 ; eRFPath < priv->num_total_rf_path; eRFPath++) { -if (!rtl92e_is_legal_rf_path (dev, eRFPath)) -continue ; -switch (bandwidth) {case HT_CHANNEL_WIDTH_20 : rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,
@@ -67,9 +64,6 @@ bool rtl92e_config_rf(struct net_device *dev)for (eRFPath = (enum rf90_radio_path )RF90_PATH_A ; eRFPath < priv->num_total_rf_path; eRFPath++) { -if (!rtl92e_is_legal_rf_path (dev, eRFPath)) -continue ; - pPhyReg = &priv->phy_reg_def[eRFPath];switch (eRFPath) {
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +0 -2
@@ -1515,8 +1515,6 @@ static void _rtl92e_process_phyinfo(struct r8192_priv *priv, u8 *buffer,if (!prev_st->bIsCCK && prev_st->bPacketToSelf) {for (rfpath =RF90_PATH_A ; rfpath < priv->num_total_rf_path; rfpath++) { -if (!rtl92e_is_legal_rf_path (priv->rtllib->dev, rfpath)) -continue ;if (priv->stats.rx_rssi_percentage[rfpath] ==0 ) { priv->stats.rx_rssi_percentage[rfpath] = prev_st->RxMIMOSignalStrength[rfpath];
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +0 -18
@@ -47,20 +47,6 @@ static u32 _rtl92e_calculate_bit_shift(u32 dwBitMask)return ffs (dwBitMask) -1 ; } -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_1T2R ) { -if (eRFPath ==RF90_PATH_A || eRFPath ==RF90_PATH_B ) - ret =1 ; -else if (eRFPath ==RF90_PATH_C || eRFPath ==RF90_PATH_D ) - ret =0 ; - } -return ret; -} -void rtl92e_set_bb_reg (struct net_device *dev,u32 dwRegAddr,u32 dwBitMask,u32 dwData) {
@@ -196,8 +182,6 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,struct r8192_priv *priv =rtllib_priv (dev);u32 Original_Value, BitShift, New_Value; -if (!rtl92e_is_legal_rf_path (dev, eRFPath)) -return ;if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)return ;
@@ -233,8 +217,6 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath,u32 Original_Value, Readback_Value, BitShift;struct r8192_priv *priv =rtllib_priv (dev); -if (!rtl92e_is_legal_rf_path (dev, eRFPath)) -return 0 ;if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter)return 0 ;mutex_lock (&priv->rf_mutex);
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +0 -1
@@ -49,7 +49,6 @@ enum rf90_radio_path {#define bMaskLWord 0x0000ffff#define bMaskDWord 0xffffffff -u8 rtl92e_is_legal_rf_path (struct net_device *dev,u32 eRFPath);void rtl92e_set_bb_reg (struct net_device *dev,u32 dwRegAddr,u32 dwBitMask,u32 dwData);u32 rtl92e_get_bb_reg (struct net_device *dev,u32 dwRegAddr,u32 dwBitMask);
Signature · 1 line
2.39.2