Skip to contentSkip to conversation

rtlwifi: remove duplicate code

PATCH In review Gustavo A. R. Silva 3 participants 4 messages May 24, 2018 – May 29, 2018

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: remove duplicate code

Remove and refactor some code in order to avoid having identical code for different branches.

Notice that the logic has been there since 2014.

Addresses-Coverity-ID: 1426199 ("Identical code for different branches")

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c    | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +4 -19
index 279fe01..df3facc 100644
@@ -2876,25 +2876,10 @@ static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
 		btc8723b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 13);
 
 	/* sw mechanism */
-	if (BTC_WIFI_BW_HT40 == wifi_bw) {
-		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-		    (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-			btc8723b2ant_sw_mechanism(btcoexist, true, true,
-						  false, false);
-		} else {
-			btc8723b2ant_sw_mechanism(btcoexist, true, true,
-						  false, false);
-		}
-	} else {
-		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-		    (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-			btc8723b2ant_sw_mechanism(btcoexist, false, true,
-						  false, false);
-		} else {
-			btc8723b2ant_sw_mechanism(btcoexist, false, true,
-						  false, false);
-		}
-	}
+	if (wifi_bw == BTC_WIFI_BW_HT40)
+		btc8723b2ant_sw_mechanism(btcoexist, true, true, false, false);
+	else
+		btc8723b2ant_sw_mechanism(btcoexist, false, true, false, false);
 }
 
 /* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */
Signature · 1 line
2.7.4
#1 lore raw
Quoted 2 lines · Gustavo A. R. Silva

Remove and refactor some code in order to avoid having identical code for different branches.

True and nice tool and patch submittal thanks.

Quoted 1 line

Notice that the logic has been there since 2014.

But perhaps the original logic is a defective copy/paste and it should be corrected instead.

Can anyone from realtek verify this?

Quoted 40 lines

Addresses-Coverity-ID: 1426199 ("Identical code for different branches")

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c    | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +4 -19
index 279fe01..df3facc 100644
@@ -2876,25 +2876,10 @@ static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
 		btc8723b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 13);
 
 	/* sw mechanism */
-	if (BTC_WIFI_BW_HT40 == wifi_bw) {
-		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-		    (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-			btc8723b2ant_sw_mechanism(btcoexist, true, true,
-						  false, false);
-		} else {
-			btc8723b2ant_sw_mechanism(btcoexist, true, true,
-						  false, false);
-		}
-	} else {
-		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-		    (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-			btc8723b2ant_sw_mechanism(btcoexist, false, true,
-						  false, false);
-		} else {
-			btc8723b2ant_sw_mechanism(btcoexist, false, true,
-						  false, false);
-		}
-	}
+	if (wifi_bw == BTC_WIFI_BW_HT40)
+		btc8723b2ant_sw_mechanism(btcoexist, true, true, false, false);
+	else
+		btc8723b2ant_sw_mechanism(btcoexist, false, true, false, false);
 }
 
 /* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */
author
#2 lore raw

Hi Joe,

Quoted 4 lines · Joe Perches
Quoted 2 lines · Gustavo A. R. Silva

Remove and refactor some code in order to avoid having identical code for different branches.

Quoted 9 lines

True and nice tool and patch submittal thanks.

Quoted 1 line

Notice that the logic has been there since 2014.

But perhaps the original logic is a defective copy/paste and it should be corrected instead.

Can anyone from realtek verify this?

I actually used gitk to track down the last changes made to this code and, it doesn't look like a copy/paste issue:

commit: c6821613e653aae4f54c75689e229e3f063b7f69
commit: 27a31a60a4de4c1b45e371152bb6e701e1a8cc40

Thanks
--
Gustavo

Quoted 40 lines
Quoted 40 lines

Addresses-Coverity-ID: 1426199 ("Identical code for different branches")

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
  .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c    | 23 ++++------------------
  1 file changed, 4 insertions(+), 19 deletions(-)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c +4 -19
index 279fe01..df3facc 100644
@@ -2876,25 +2876,10 @@ static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
  		btc8723b2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 13);
 
  	/* sw mechanism */
-	if (BTC_WIFI_BW_HT40 == wifi_bw) {
-		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-		    (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-			btc8723b2ant_sw_mechanism(btcoexist, true, true,
-						  false, false);
-		} else {
-			btc8723b2ant_sw_mechanism(btcoexist, true, true,
-						  false, false);
-		}
-	} else {
-		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
-		    (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
-			btc8723b2ant_sw_mechanism(btcoexist, false, true,
-						  false, false);
-		} else {
-			btc8723b2ant_sw_mechanism(btcoexist, false, true,
-						  false, false);
-		}
-	}
+	if (wifi_bw == BTC_WIFI_BW_HT40)
+		btc8723b2ant_sw_mechanism(btcoexist, true, true, false, false);
+	else
+		btc8723b2ant_sw_mechanism(btcoexist, false, true, false, false);
  }
 
  /* A2DP only / PAN(EDR) only/ A2DP+PAN(HS) */
#3 lore raw
In reply to Gustavo A. R. Silva
Quoted 7 lines · Gustavo A. R. Silva

Remove and refactor some code in order to avoid having identical code for different branches.

Notice that the logic has been there since 2014.

Addresses-Coverity-ID: 1426199 ("Identical code for different branches")

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

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

06895b1627fe rtlwifi: remove duplicate code

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

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