Re: [PATCH] rtlwifi: remove duplicate code

["Gustavo A. R. Silva" <gustavo@embeddedor.com>]

Hi Joe,

On 05/24/2018 02:24 PM, Joe Perches wrote:
> On Thu, 2018-05-24 at 13:54 -0500, Gustavo A. R. Silva wrote:
>> Remove and refactor some code in order to avoid having identical code
>> for different branches.
> 
> True and nice tool and patch submittal thanks.
> 
>> 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

>> Addresses-Coverity-ID: 1426199 ("Identical code for different branches")
>> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
>> ---
>>   .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c    | 23 ++++------------------
>>   1 file changed, 4 insertions(+), 19 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
>> index 279fe01..df3facc 100644
>> --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
>> +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
>> @@ -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) */