Fix following coccinelle warning:
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2952:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2961:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3011:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3020:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3439:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3448:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3339:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3348:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3074:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3083:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3192:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3201:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3267:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3276:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3124:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3133:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2821:2-4: WARNING: possible condition with no effect (if == else)
./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2830:2-4: WARNING: possible condition with no effect (if == else)
Signed-off-by: YueHaibing <[email protected]>
---
.../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 180 +++++----------------
1 file changed, 36 insertions(+), 144 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
index df3facc..6597f7c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
@@ -2818,23 +2818,11 @@ static void btc8723b2ant_action_sco(struct btc_coexist *btcoexist)
/* 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);
- }
+ 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);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, true,
+ false, false);
}
}
@@ -2949,23 +2937,11 @@ static void btc8723b2ant_action_a2dp(struct btc_coexist *btcoexist)
/* sw mechanism */
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
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, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, true, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, true, false,
+ false, false);
} else {
- if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
- (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, false,
+ false, false);
}
}
@@ -3008,23 +2984,11 @@ static void btc8723b2ant_action_a2dp_pan_hs(struct btc_coexist *btcoexist)
/* sw mechanism */
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
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, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, true, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, true, false,
+ false, false);
} else {
- if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
- (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, false,
+ false, false);
}
}
@@ -3071,23 +3035,11 @@ static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist)
/* sw mechanism */
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
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, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, true, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, true, false,
+ false, false);
} else {
- if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
- (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, false,
+ false, false);
}
}
@@ -3121,23 +3073,11 @@ static void btc8723b2ant_action_pan_hs(struct btc_coexist *btcoexist)
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
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, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, true, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, true, false,
+ false, false);
} else {
- if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
- (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, false,
+ false, false);
}
}
@@ -3189,23 +3129,11 @@ static void btc8723b2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist)
/* 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, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, true, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, true, false,
+ false, false);
} else {
- if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
- (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- } else {
- btc8723b2ant_sw_mechanism(btcoexist, false, false,
- false, false);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, false,
+ false, false);
}
}
@@ -3264,23 +3192,11 @@ static void btc8723b2ant_action_pan_edr_hid(struct btc_coexist *btcoexist)
/* 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);
- }
+ 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);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, true,
+ false, false);
}
}
@@ -3336,23 +3252,11 @@ static void btc8723b2ant_action_hid_a2dp_pan_edr(struct btc_coexist *btcoexist)
/* 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);
- }
+ 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);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, true,
+ false, false);
}
}
@@ -3436,23 +3340,11 @@ static void btc8723b2ant_action_hid_a2dp(struct btc_coexist *btcoexist)
/* 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);
- }
+ 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);
- }
+ btc8723b2ant_sw_mechanism(btcoexist, false, true,
+ false, false);
}
}
--
2.7.0
T24gTW9uLCAyMDE4LTA4LTA2IGF0IDEyOjU0ICswODAwLCBZdWVIYWliaW5nIHdyb3RlOg0KPiBG
aXggZm9sbG93aW5nIGNvY2NpbmVsbGUgd2FybmluZzoNCj4gDQo+IC4vZHJpdmVycy9uZXQvd2ly
ZWxlc3MvcmVhbHRlay9ydGx3aWZpL2J0Y29leGlzdC9oYWxidGM4NzIzYjJhbnQuYzoyOTUyOjIt
NDogV0FSTklORzogcG9zc2libGUNCj4gY29uZGl0aW9uIHdpdGggbm8gZWZmZWN0IChpZiA9PSBl
bHNlKQ0KPiAuL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3JlYWx0ZWsvcnRsd2lmaS9idGNvZXhpc3Qv
aGFsYnRjODcyM2IyYW50LmM6Mjk2MToyLTQ6IFdBUk5JTkc6IHBvc3NpYmxlDQo+IGNvbmRpdGlv
biB3aXRoIG5vIGVmZmVjdCAoaWYgPT0gZWxzZSkNCj4gLi9kcml2ZXJzL25ldC93aXJlbGVzcy9y
ZWFsdGVrL3J0bHdpZmkvYnRjb2V4aXN0L2hhbGJ0Yzg3MjNiMmFudC5jOjMwMTE6Mi00OiBXQVJO
SU5HOiBwb3NzaWJsZQ0KPiBjb25kaXRpb24gd2l0aCBubyBlZmZlY3QgKGlmID09IGVsc2UpDQo+
IC4vZHJpdmVycy9uZXQvd2lyZWxlc3MvcmVhbHRlay9ydGx3aWZpL2J0Y29leGlzdC9oYWxidGM4
NzIzYjJhbnQuYzozMDIwOjItNDogV0FSTklORzogcG9zc2libGUNCj4gY29uZGl0aW9uIHdpdGgg
bm8gZWZmZWN0IChpZiA9PSBlbHNlKQ0KPiAuL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3JlYWx0ZWsv
cnRsd2lmaS9idGNvZXhpc3QvaGFsYnRjODcyM2IyYW50LmM6MzQzOToyLTQ6IFdBUk5JTkc6IHBv
c3NpYmxlDQo+IGNvbmRpdGlvbiB3aXRoIG5vIGVmZmVjdCAoaWYgPT0gZWxzZSkNCj4gLi9kcml2
ZXJzL25ldC93aXJlbGVzcy9yZWFsdGVrL3J0bHdpZmkvYnRjb2V4aXN0L2hhbGJ0Yzg3MjNiMmFu
dC5jOjM0NDg6Mi00OiBXQVJOSU5HOiBwb3NzaWJsZQ0KPiBjb25kaXRpb24gd2l0aCBubyBlZmZl
Y3QgKGlmID09IGVsc2UpDQo+IC4vZHJpdmVycy9uZXQvd2lyZWxlc3MvcmVhbHRlay9ydGx3aWZp
L2J0Y29leGlzdC9oYWxidGM4NzIzYjJhbnQuYzozMzM5OjItNDogV0FSTklORzogcG9zc2libGUN
Cj4gY29uZGl0aW9uIHdpdGggbm8gZWZmZWN0IChpZiA9PSBlbHNlKQ0KPiAuL2RyaXZlcnMvbmV0
L3dpcmVsZXNzL3JlYWx0ZWsvcnRsd2lmaS9idGNvZXhpc3QvaGFsYnRjODcyM2IyYW50LmM6MzM0
ODoyLTQ6IFdBUk5JTkc6IHBvc3NpYmxlDQo+IGNvbmRpdGlvbiB3aXRoIG5vIGVmZmVjdCAoaWYg
PT0gZWxzZSkNCj4gLi9kcml2ZXJzL25ldC93aXJlbGVzcy9yZWFsdGVrL3J0bHdpZmkvYnRjb2V4
aXN0L2hhbGJ0Yzg3MjNiMmFudC5jOjMwNzQ6Mi00OiBXQVJOSU5HOiBwb3NzaWJsZQ0KPiBjb25k
aXRpb24gd2l0aCBubyBlZmZlY3QgKGlmID09IGVsc2UpDQo+IC4vZHJpdmVycy9uZXQvd2lyZWxl
c3MvcmVhbHRlay9ydGx3aWZpL2J0Y29leGlzdC9oYWxidGM4NzIzYjJhbnQuYzozMDgzOjItNDog
V0FSTklORzogcG9zc2libGUNCj4gY29uZGl0aW9uIHdpdGggbm8gZWZmZWN0IChpZiA9PSBlbHNl
KQ0KPiAuL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3JlYWx0ZWsvcnRsd2lmaS9idGNvZXhpc3QvaGFs
YnRjODcyM2IyYW50LmM6MzE5MjoyLTQ6IFdBUk5JTkc6IHBvc3NpYmxlDQo+IGNvbmRpdGlvbiB3
aXRoIG5vIGVmZmVjdCAoaWYgPT0gZWxzZSkNCj4gLi9kcml2ZXJzL25ldC93aXJlbGVzcy9yZWFs
dGVrL3J0bHdpZmkvYnRjb2V4aXN0L2hhbGJ0Yzg3MjNiMmFudC5jOjMyMDE6Mi00OiBXQVJOSU5H
OiBwb3NzaWJsZQ0KPiBjb25kaXRpb24gd2l0aCBubyBlZmZlY3QgKGlmID09IGVsc2UpDQo+IC4v
ZHJpdmVycy9uZXQvd2lyZWxlc3MvcmVhbHRlay9ydGx3aWZpL2J0Y29leGlzdC9oYWxidGM4NzIz
YjJhbnQuYzozMjY3OjItNDogV0FSTklORzogcG9zc2libGUNCj4gY29uZGl0aW9uIHdpdGggbm8g
ZWZmZWN0IChpZiA9PSBlbHNlKQ0KPiAuL2RyaXZlcnMvbmV0L3dpcmVsZXNzL3JlYWx0ZWsvcnRs
d2lmaS9idGNvZXhpc3QvaGFsYnRjODcyM2IyYW50LmM6MzI3NjoyLTQ6IFdBUk5JTkc6IHBvc3Np
YmxlDQo+IGNvbmRpdGlvbiB3aXRoIG5vIGVmZmVjdCAoaWYgPT0gZWxzZSkNCj4gLi9kcml2ZXJz
L25ldC93aXJlbGVzcy9yZWFsdGVrL3J0bHdpZmkvYnRjb2V4aXN0L2hhbGJ0Yzg3MjNiMmFudC5j
OjMxMjQ6Mi00OiBXQVJOSU5HOiBwb3NzaWJsZQ0KPiBjb25kaXRpb24gd2l0aCBubyBlZmZlY3Qg
KGlmID09IGVsc2UpDQo+IC4vZHJpdmVycy9uZXQvd2lyZWxlc3MvcmVhbHRlay9ydGx3aWZpL2J0
Y29leGlzdC9oYWxidGM4NzIzYjJhbnQuYzozMTMzOjItNDogV0FSTklORzogcG9zc2libGUNCj4g
Y29uZGl0aW9uIHdpdGggbm8gZWZmZWN0IChpZiA9PSBlbHNlKQ0KPiAuL2RyaXZlcnMvbmV0L3dp
cmVsZXNzL3JlYWx0ZWsvcnRsd2lmaS9idGNvZXhpc3QvaGFsYnRjODcyM2IyYW50LmM6MjgyMToy
LTQ6IFdBUk5JTkc6IHBvc3NpYmxlDQo+IGNvbmRpdGlvbiB3aXRoIG5vIGVmZmVjdCAoaWYgPT0g
ZWxzZSkNCj4gLi9kcml2ZXJzL25ldC93aXJlbGVzcy9yZWFsdGVrL3J0bHdpZmkvYnRjb2V4aXN0
L2hhbGJ0Yzg3MjNiMmFudC5jOjI4MzA6Mi00OiBXQVJOSU5HOiBwb3NzaWJsZQ0KPiBjb25kaXRp
b24gd2l0aCBubyBlZmZlY3QgKGlmID09IGVsc2UpDQoNCkFja2VkLWJ5OiBQaW5nLUtlIFNoaWgg
PHBrc2hpaEByZWFsdGVrLmNvbT4NCg0KPiANCj4gU2lnbmVkLW9mZi1ieTogWXVlSGFpYmluZyA8
eXVlaGFpYmluZ0BodWF3ZWkuY29tPg0KPiAtLS0NCg==
On 08/06/2018 04:42 PM, [email protected] wrote:
> On Mon, 06 Aug 2018 12:54:40 +0800, YueHaibing said:
>> Fix following coccinelle warning:
>>
>> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2952:2-4: WARNING: possible condition with no effect (if == else)
>
>> /* 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);
>> - }
>> + btc8723b2ant_sw_mechanism(btcoexist, true, true,
>> + false, false);
>> } else {
>
> Rather than blindly fixing this, perhaps a bit of thought needs to be
> applied to why this code looks like this in the first place.
>
> See commit c6821613e653a (which looks like the bletcherous "do too many
> things at once" commit indeed), although the actual diff appears to be a
> "no harm, no foul" against this commit, where the issue already existed.
>
> commit aa45a673b291fd761275493bc15316d79555ed55
> Author: Larry Finger <[email protected]>
> Date: Fri Feb 28 15:16:43 2014 -0600
>
> rtlwifi: btcoexist: Add new mini driver
>
> Larry? Can you reach back to 2014 and remember why this code
> looked like this in the first place?
The base code came from Realtek. My only part in getting it into the kernel was
to clean up the checkpatch and Sparse errors and warnings, and submit it. I was
a "script kiddy" just like the authors of the current patches. The only
difference is that I was getting drivers into the kernel so that users hardware
would work.
Any record of whether these duplicate branches are the result of incorrect copy
and paste, or just extraneous code, would be at Realtek in their version control
history. I have never had access to such archives, nor have I ever had an
non-disclosure agreement with Realtek.
Ping-Ke Shih, who is Cc'd on these messages, might be able to answer these
questions.
For the moment, these simplifications could be applied as long as they are
correctly done. After all, they are not changing what is already there and that
stops any other person that knows how to run coccinelle from submitting the same
patch in the future. Why "kick the can down the road"? If PK can find that there
was an error in the original code, he can submit a "Fixes" patch.
Larry
YueHaibing <[email protected]> wrote:
> Fix following coccinelle warning:
>
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2952:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2961:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3011:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3020:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3439:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3448:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3339:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3348:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3074:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3083:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3192:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3201:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3267:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3276:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3124:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:3133:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2821:2-4: WARNING: possible condition with no effect (if == else)
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2830:2-4: WARNING: possible condition with no effect (if == else)
>
> Signed-off-by: YueHaibing <[email protected]>
> Acked-by: Ping-Ke Shih <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
ad2e6d23bdad rtlwifi: btcoex: Fix if == else warnings in halbtc8723b2ant.c
--
https://patchwork.kernel.org/patch/10556487/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
T24gVHVlLCAyMDE4LTA4LTA3IGF0IDA5OjIzIC0wNTAwLCBMYXJyeSBGaW5nZXIgd3JvdGU6DQo+
IE9uIDA4LzA2LzIwMTggMDQ6NDIgUE0sIHZhbGRpcy5rbGV0bmlla3NAdnQuZWR1IHdyb3RlOg0K
PiA+IE9uIE1vbiwgMDYgQXVnIDIwMTggMTI6NTQ6NDAgKzA4MDAsIFl1ZUhhaWJpbmcgc2FpZDoN
Cj4gPj4gRml4IGZvbGxvd2luZyBjb2NjaW5lbGxlIHdhcm5pbmc6DQo+ID4+DQo+ID4+IC4vZHJp
dmVycy9uZXQvd2lyZWxlc3MvcmVhbHRlay9ydGx3aWZpL2J0Y29leGlzdC9oYWxidGM4NzIzYjJh
bnQuYzoyOTUyOjItNDogV0FSTklORzogcG9zc2libGUNCj4gY29uZGl0aW9uIHdpdGggbm8gZWZm
ZWN0IChpZiA9PSBlbHNlKQ0KPiA+wqANCj4gPj7CoMKgwqAJLyogc3cgbWVjaGFuaXNtICovDQo+
ID4+wqDCoMKgCWlmIChCVENfV0lGSV9CV19IVDQwID09IHdpZmlfYncpIHsNCj4gPj4gLQkJaWYg
KCh3aWZpX3Jzc2lfc3RhdGUgPT0gQlRDX1JTU0lfU1RBVEVfSElHSCkgfHwNCj4gPj4gLQkJwqDC
oMKgwqAod2lmaV9yc3NpX3N0YXRlID09IEJUQ19SU1NJX1NUQVRFX1NUQVlfSElHSCkpIHsNCj4g
Pj4gLQkJCWJ0Yzg3MjNiMmFudF9zd19tZWNoYW5pc20oYnRjb2V4aXN0LCB0cnVlLCB0cnVlLA0K
PiA+PiAtCQkJCQkJwqDCoGZhbHNlLCBmYWxzZSk7DQo+ID4+IC0JCX0gZWxzZSB7DQo+ID4+IC0J
CQlidGM4NzIzYjJhbnRfc3dfbWVjaGFuaXNtKGJ0Y29leGlzdCwgdHJ1ZSwgdHJ1ZSwNCj4gPj4g
LQkJCQkJCcKgwqBmYWxzZSwgZmFsc2UpOw0KPiA+PiAtCQl9DQo+ID4+ICsJCWJ0Yzg3MjNiMmFu
dF9zd19tZWNoYW5pc20oYnRjb2V4aXN0LCB0cnVlLCB0cnVlLA0KPiA+PiArCQkJCQnCoMKgZmFs
c2UsIGZhbHNlKTsNCj4gPj7CoMKgwqAJfSBlbHNlIHsNCj4gPsKgDQo+ID4gUmF0aGVyIHRoYW4g
YmxpbmRseSBmaXhpbmcgdGhpcywgcGVyaGFwcyBhIGJpdCBvZiB0aG91Z2h0IG5lZWRzIHRvIGJl
DQo+ID4gYXBwbGllZCB0byB3aHkgdGhpcyBjb2RlIGxvb2tzIGxpa2UgdGhpcyBpbiB0aGUgZmly
c3QgcGxhY2UuDQo+ID7CoA0KPiA+IFNlZSBjb21taXQgYzY4MjE2MTNlNjUzYcKgwqAod2hpY2gg
bG9va3MgbGlrZSB0aGUgYmxldGNoZXJvdXMgImRvIHRvbyBtYW55DQo+ID4gdGhpbmdzIGF0IG9u
Y2UiIGNvbW1pdCBpbmRlZWQpLCBhbHRob3VnaCB0aGUgYWN0dWFsIGRpZmYgYXBwZWFycyB0byBi
ZSBhDQo+ID4gIm5vIGhhcm0sIG5vIGZvdWwiIGFnYWluc3QgdGhpcyBjb21taXQsIHdoZXJlIHRo
ZSBpc3N1ZSBhbHJlYWR5IGV4aXN0ZWQuDQo+ID7CoA0KPiA+IGNvbW1pdCBhYTQ1YTY3M2IyOTFm
ZDc2MTI3NTQ5M2JjMTUzMTZkNzk1NTVlZDU1DQo+ID4gQXV0aG9yOiBMYXJyeSBGaW5nZXIgPExh
cnJ5LkZpbmdlckBsd2Zpbmdlci5uZXQ+DQo+ID4gRGF0ZTrCoMKgwqBGcmkgRmViIDI4IDE1OjE2
OjQzIDIwMTQgLTA2MDANCj4gPsKgDQo+ID7CoMKgwqDCoMKgwqBydGx3aWZpOiBidGNvZXhpc3Q6
IEFkZCBuZXcgbWluaSBkcml2ZXINCj4gPsKgDQo+ID4gTGFycnk/IENhbiB5b3UgcmVhY2ggYmFj
ayB0byAyMDE0IGFuZCByZW1lbWJlciB3aHkgdGhpcyBjb2RlDQo+ID4gbG9va2VkIGxpa2UgdGhp
cyBpbiB0aGUgZmlyc3QgcGxhY2U/DQo+IA0KPiBUaGUgYmFzZSBjb2RlIGNhbWUgZnJvbSBSZWFs
dGVrLiBNeSBvbmx5IHBhcnQgaW4gZ2V0dGluZyBpdCBpbnRvIHRoZSBrZXJuZWwgd2FzwqANCj4g
dG8gY2xlYW4gdXAgdGhlIGNoZWNrcGF0Y2ggYW5kIFNwYXJzZSBlcnJvcnMgYW5kIHdhcm5pbmdz
LCBhbmQgc3VibWl0IGl0LiBJIHdhc8KgDQo+IGEgInNjcmlwdCBraWRkeSIganVzdCBsaWtlIHRo
ZSBhdXRob3JzIG9mIHRoZSBjdXJyZW50IHBhdGNoZXMuIFRoZSBvbmx5wqANCj4gZGlmZmVyZW5j
ZSBpcyB0aGF0IEkgd2FzIGdldHRpbmcgZHJpdmVycyBpbnRvIHRoZSBrZXJuZWwgc28gdGhhdCB1
c2VycyBoYXJkd2FyZcKgDQo+IHdvdWxkIHdvcmsuDQo+IA0KPiBBbnkgcmVjb3JkIG9mIHdoZXRo
ZXIgdGhlc2UgZHVwbGljYXRlIGJyYW5jaGVzIGFyZSB0aGUgcmVzdWx0IG9mIGluY29ycmVjdCBj
b3B5wqANCj4gYW5kIHBhc3RlLCBvciBqdXN0IGV4dHJhbmVvdXMgY29kZSwgd291bGQgYmUgYXQg
UmVhbHRlayBpbiB0aGVpciB2ZXJzaW9uIGNvbnRyb2zCoA0KPiBoaXN0b3J5LiBJIGhhdmUgbmV2
ZXIgaGFkIGFjY2VzcyB0byBzdWNoIGFyY2hpdmVzLCBub3IgaGF2ZSBJIGV2ZXIgaGFkIGFuwqAN
Cj4gbm9uLWRpc2Nsb3N1cmUgYWdyZWVtZW50IHdpdGggUmVhbHRlay4NCj4gDQo+IFBpbmctS2Ug
U2hpaCwgd2hvIGlzIENjJ2Qgb24gdGhlc2UgbWVzc2FnZXMsIG1pZ2h0IGJlIGFibGUgdG8gYW5z
d2VyIHRoZXNlwqANCj4gcXVlc3Rpb25zLg0KDQpUaGVzZSBicmFuY2hlcyBpcyB1c2VkIHRvIGlt
cHJvdmUgdXNlciBleHBlcmllbmNlIGFjY29yZGluZyB0byBSU1NJIHN0cmVuZ3RoLCBidXQNCml0
IGhhcyBub3Qgc2lnbmlmaWNhbnQgaW1wcm92ZW1lbnQgc28gdGhlIHNhbWUgYXJndW1lbnRzIGJl
Y29tZSBkdXBsaWNhdGUgYnJhbmNoZXMuDQpJIGNoZWNrIHRoZSBsYXRlc3QgY29kZSBvZsKgaGFs
YnRjODcyM2IyYW50LmMsIHRoZXJlIGFyZSBtb3JlIHRoYW4gb25lIHN0YXRlbWVudHMNCndpdGhp
biBpZi1lbHNlIGJyYW5jaCB0byBpbXByb3ZlIHBlcmZvcm1hbmNlLCBidXQgdGhlIHN0YXRlbWVu
dHMgbWVudGlvbmVkIGJ5wqANCnRoaXMgcGF0Y2ggYXJlIHN0aWxsIHRoZSBzYW1lLiBTbywgdGhl
c2UgZHVwbGljYXRlIGJyYW5jaGVzIGNhbiBiZSBzYWZlbHkgcmVtb3ZlZC4NCg0KPiANCj4gRm9y
IHRoZSBtb21lbnQsIHRoZXNlIHNpbXBsaWZpY2F0aW9ucyBjb3VsZCBiZSBhcHBsaWVkIGFzIGxv
bmcgYXMgdGhleSBhcmXCoA0KPiBjb3JyZWN0bHkgZG9uZS4gQWZ0ZXIgYWxsLCB0aGV5IGFyZSBu
b3QgY2hhbmdpbmcgd2hhdCBpcyBhbHJlYWR5IHRoZXJlIGFuZCB0aGF0wqANCj4gc3RvcHMgYW55
IG90aGVyIHBlcnNvbiB0aGF0IGtub3dzIGhvdyB0byBydW4gY29jY2luZWxsZSBmcm9tIHN1Ym1p
dHRpbmcgdGhlIHNhbWXCoA0KPiBwYXRjaCBpbiB0aGUgZnV0dXJlLiBXaHkgImtpY2sgdGhlIGNh
biBkb3duIHRoZSByb2FkIj8gSWYgUEsgY2FuIGZpbmQgdGhhdCB0aGVyZcKgDQo+IHdhcyBhbiBl
cnJvciBpbiB0aGUgb3JpZ2luYWwgY29kZSwgaGUgY2FuIHN1Ym1pdCBhICJGaXhlcyIgcGF0Y2gu
DQo+IA0KPiANCg0K
On Mon, 06 Aug 2018 12:54:40 +0800, YueHaibing said:
> Fix following coccinelle warning:
>
> ./drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c:2952:2-4: WARNING: possible condition with no effect (if == else)
> /* 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);
> - }
> + btc8723b2ant_sw_mechanism(btcoexist, true, true,
> + false, false);
> } else {
Rather than blindly fixing this, perhaps a bit of thought needs to be
applied to why this code looks like this in the first place.
See commit c6821613e653a (which looks like the bletcherous "do too many
things at once" commit indeed), although the actual diff appears to be a
"no harm, no foul" against this commit, where the issue already existed.
commit aa45a673b291fd761275493bc15316d79555ed55
Author: Larry Finger <[email protected]>
Date: Fri Feb 28 15:16:43 2014 -0600
rtlwifi: btcoexist: Add new mini driver
Larry? Can you reach back to 2014 and remember why this code
looked like this in the first place?