Skip to contentSkip to conversation

rtlwifi: rtl8723be: fix duplicated code for different branches

PATCH In review Gustavo A. R. Silva 3 participants 3 messages Aug 30, 2017 – Aug 31, 2017

Subsystems (3)
Networking Network drivers Realtek wireless driver (rtlwifi family)
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 rtlwifi: rtl8723be: fix duplicated code for different branches

Refactor code in order to avoid identical code for different branches.

Addresses-Coverity-ID: 1248728

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
This issue was reported by Coverity and it was tested by compilation only. Please, verify if this is not a copy/paste error.
Also, notice this code has been there since 2014.

 drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c +2 -6
index 131c0d1..15c117e 100644
@@ -883,12 +883,8 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter(
 	if ((rtldm->power_index_offset[RF90_PATH_A] != 0) &&
 	    (rtldm->txpower_track_control)) {
 		rtldm->done_txpower = true;
-		if (thermalvalue > rtlefuse->eeprom_thermalmeter)
-			rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
-							     index_for_channel);
-		else
-			rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
-							     index_for_channel);
+		rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
+						      index_for_channel);
 
 		rtldm->swing_idx_cck_base = rtldm->swing_idx_cck;
 		rtldm->swing_idx_ofdm_base[RF90_PATH_A] =
Signature · 1 line
2.5.0
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Gustavo A. R. Silva

Refactor code in order to avoid identical code for different branches.

Addresses-Coverity-ID: 1248728

Signed-off-by Gustavo A. R. Silva <[email protected]>

According to Realtek, this change is OK.

Acked-by Larry Finger <[email protected]>

Thanks,

Larry

Quoted 28 lines

---
This issue was reported by Coverity and it was tested by compilation only. Please, verify if this is not a copy/paste error.
Also, notice this code has been there since 2014.

  drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723be/dm.c +2 -6
index 131c0d1..15c117e 100644
@@ -883,12 +883,8 @@ static void rtl8723be_dm_txpower_tracking_callback_thermalmeter(
  	if ((rtldm->power_index_offset[RF90_PATH_A] != 0) &&
  	    (rtldm->txpower_track_control)) {
  		rtldm->done_txpower = true;
-		if (thermalvalue > rtlefuse->eeprom_thermalmeter)
-			rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
-							     index_for_channel);
-		else
-			rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
-							     index_for_channel);
+		rtl8723be_dm_tx_power_track_set_power(hw, BBSWING, 0,
+						      index_for_channel);
 
  		rtldm->swing_idx_cck_base = rtldm->swing_idx_cck;
  		rtldm->swing_idx_ofdm_base[RF90_PATH_A] =
#2 lore raw
In reply to Gustavo A. R. Silva
Quoted 5 lines · Gustavo A. R. Silva

Refactor code in order to avoid identical code for different branches.

Addresses-Coverity-ID: 1248728

Signed-off-by Gustavo A. R. Silva <[email protected]>
Acked-by Larry Finger <[email protected]>

Patch applied to wireless-drivers-next.git, thanks.

a9a65a6b2b69 rtlwifi: rtl8723be: fix duplicated code for different branches

Signature · 3 lines
https://patchwork.kernel.org/patch/9930325/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches