Skip to content

L
linux
Commit ad2e6d23 authored by YueHaibing's avatar YueHaibing Committed by Kalle Valo
Browse files
Options

rtlwifi: btcoex: Fix if == else warnings in halbtc8723b2ant.c 

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: default avatarYueHaibing <yuehaibing@huawei.com>
Acked-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 26b701ad
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 144 deletions
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.c
View file @ ad2e6d23
...@@ -2818,24 +2818,12 @@ static void btc8723b2ant_action_sco(struct btc_coexist *btcoexist) ...@@ -2818,24 +2818,12 @@ static void btc8723b2ant_action_sco(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
if (BTC_WIFI_BW_HT40 == 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, true,
false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, true, true, btc8723b2ant_sw_mechanism(btcoexist, true, true,
false, 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, true,
false, false);
} else { } else {
btc8723b2ant_sw_mechanism(btcoexist, false, true, btc8723b2ant_sw_mechanism(btcoexist, false, true,
false, false); false, false);
} }
}
} }
static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist) static void btc8723b2ant_action_hid(struct btc_coexist *btcoexist)
...@@ -2949,23 +2937,11 @@ static void btc8723b2ant_action_a2dp(struct btc_coexist *btcoexist) ...@@ -2949,23 +2937,11 @@ static void btc8723b2ant_action_a2dp(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
if (BTC_WIFI_BW_HT40 == 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, btc8723b2ant_sw_mechanism(btcoexist, true, false,
false, false); false, false);
} else { } else {
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, btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false); false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false);
}
} }
} }
...@@ -3008,24 +2984,12 @@ static void btc8723b2ant_action_a2dp_pan_hs(struct btc_coexist *btcoexist) ...@@ -3008,24 +2984,12 @@ static void btc8723b2ant_action_a2dp_pan_hs(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
if (BTC_WIFI_BW_HT40 == 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, btc8723b2ant_sw_mechanism(btcoexist, true, false,
false, false); false, false);
} else {
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 { } else {
btc8723b2ant_sw_mechanism(btcoexist, false, false, btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false); false, false);
} }
}
} }
static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist) static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist)
...@@ -3071,24 +3035,12 @@ static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist) ...@@ -3071,24 +3035,12 @@ static void btc8723b2ant_action_pan_edr(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
if (BTC_WIFI_BW_HT40 == 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, btc8723b2ant_sw_mechanism(btcoexist, true, false,
false, 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 { } else {
btc8723b2ant_sw_mechanism(btcoexist, false, false, btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false); false, false);
} }
}
} }
/* PAN(HS) only */ /* PAN(HS) only */
...@@ -3121,24 +3073,12 @@ static void btc8723b2ant_action_pan_hs(struct btc_coexist *btcoexist) ...@@ -3121,24 +3073,12 @@ static void btc8723b2ant_action_pan_hs(struct btc_coexist *btcoexist)
btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw); btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);
if (BTC_WIFI_BW_HT40 == 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, btc8723b2ant_sw_mechanism(btcoexist, true, false,
false, false); false, false);
} else {
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 { } else {
btc8723b2ant_sw_mechanism(btcoexist, false, false, btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false); false, false);
} }
}
} }
/* PAN(EDR) + A2DP */ /* PAN(EDR) + A2DP */
...@@ -3189,23 +3129,11 @@ static void btc8723b2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist) ...@@ -3189,23 +3129,11 @@ static void btc8723b2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
if (BTC_WIFI_BW_HT40 == 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, btc8723b2ant_sw_mechanism(btcoexist, true, false,
false, false); false, false);
} else { } else {
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, btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false); false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, false, false,
false, false);
}
} }
} }
...@@ -3264,23 +3192,11 @@ static void btc8723b2ant_action_pan_edr_hid(struct btc_coexist *btcoexist) ...@@ -3264,23 +3192,11 @@ static void btc8723b2ant_action_pan_edr_hid(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
if (BTC_WIFI_BW_HT40 == 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, true, btc8723b2ant_sw_mechanism(btcoexist, true, true,
false, false); false, false);
} else { } 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, btc8723b2ant_sw_mechanism(btcoexist, false, true,
false, false); false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, false, true,
false, false);
}
} }
} }
...@@ -3336,24 +3252,12 @@ static void btc8723b2ant_action_hid_a2dp_pan_edr(struct btc_coexist *btcoexist) ...@@ -3336,24 +3252,12 @@ static void btc8723b2ant_action_hid_a2dp_pan_edr(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
if (BTC_WIFI_BW_HT40 == 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, true,
false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, true, true, btc8723b2ant_sw_mechanism(btcoexist, true, true,
false, 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, true,
false, false);
} else { } else {
btc8723b2ant_sw_mechanism(btcoexist, false, true, btc8723b2ant_sw_mechanism(btcoexist, false, true,
false, false); false, false);
} }
}
} }
static void btc8723b2ant_action_hid_a2dp(struct btc_coexist *btcoexist) static void btc8723b2ant_action_hid_a2dp(struct btc_coexist *btcoexist)
...@@ -3436,23 +3340,11 @@ static void btc8723b2ant_action_hid_a2dp(struct btc_coexist *btcoexist) ...@@ -3436,23 +3340,11 @@ static void btc8723b2ant_action_hid_a2dp(struct btc_coexist *btcoexist)
/* sw mechanism */ /* sw mechanism */
if (BTC_WIFI_BW_HT40 == 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, true,
false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, true, true, btc8723b2ant_sw_mechanism(btcoexist, true, true,
false, false); false, false);
}
} else { } else {
if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
(wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {
btc8723b2ant_sw_mechanism(btcoexist, false, true, btc8723b2ant_sw_mechanism(btcoexist, false, true,
false, false); false, false);
} else {
btc8723b2ant_sw_mechanism(btcoexist, false, true,
false, false);
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7