diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2017-02-11 19:46:05 -0500 | 
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-02-15 04:14:44 -0500 | 
| commit | b686784d03e66f8515198de4850d1e372b729880 (patch) | |
| tree | 677d0a5ea2f204a71d4b7c8239b29fd4e0000165 | |
| parent | 42e74946f016520a700085bc89e6250c71bb61b6 (diff) | |
rtlwifi: btcoexist: Fix if == else warnings in halbtc8723b1ant.c
The 0-DAY kernel test infrastructure reports the following:
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c:1875:2-4: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c:2253:3-5: WARNING: possible condition with no effect (if == else)
Reported-by: kbuild-all@01.org
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 24 | 
1 files changed, 4 insertions, 20 deletions
| diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c index e9f0a76107ed..d67bbfb6ad8e 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | |||
| @@ -1872,16 +1872,8 @@ static void halbtc8723b1ant_action_wifi_connected_bt_acl_busy( | |||
| 1872 | } | 1872 | } | 
| 1873 | } else if (bt_link_info->hid_exist && | 1873 | } else if (bt_link_info->hid_exist && | 
| 1874 | bt_link_info->a2dp_exist) { /*HID+A2DP */ | 1874 | bt_link_info->a2dp_exist) { /*HID+A2DP */ | 
| 1875 | if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) || | 1875 | halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 14); | 
| 1876 | (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) { | 1876 | coex_dm->auto_tdma_adjust = false; | 
| 1877 | halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, | ||
| 1878 | true, 14); | ||
| 1879 | coex_dm->auto_tdma_adjust = false; | ||
| 1880 | } else { /*for low BT RSSI*/ | ||
| 1881 | halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, | ||
| 1882 | true, 14); | ||
| 1883 | coex_dm->auto_tdma_adjust = false; | ||
| 1884 | } | ||
| 1885 | 1877 | ||
| 1886 | halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6); | 1878 | halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 6); | 
| 1887 | /*PAN(OPP,FTP), HID+PAN(OPP,FTP) */ | 1879 | /*PAN(OPP,FTP), HID+PAN(OPP,FTP) */ | 
| @@ -2250,16 +2242,8 @@ static void halbtc8723b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist) | |||
| 2250 | wifi_rssi_state = | 2242 | wifi_rssi_state = | 
| 2251 | halbtc8723b1ant_wifi_rssi_state(btcoexist, | 2243 | halbtc8723b1ant_wifi_rssi_state(btcoexist, | 
| 2252 | 1, 2, 30, 0); | 2244 | 1, 2, 30, 0); | 
| 2253 | if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) || | 2245 | halbtc8723b1ant_limited_tx(btcoexist, | 
| 2254 | (wifi_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) { | 2246 | NORMAL_EXEC, 1, 1, 1, 1); | 
| 2255 | halbtc8723b1ant_limited_tx(btcoexist, | ||
| 2256 | NORMAL_EXEC, | ||
| 2257 | 1, 1, 1, 1); | ||
| 2258 | } else { | ||
| 2259 | halbtc8723b1ant_limited_tx(btcoexist, | ||
| 2260 | NORMAL_EXEC, | ||
| 2261 | 1, 1, 1, 1); | ||
| 2262 | } | ||
| 2263 | } else { | 2247 | } else { | 
| 2264 | halbtc8723b1ant_limited_tx(btcoexist, NORMAL_EXEC, | 2248 | halbtc8723b1ant_limited_tx(btcoexist, NORMAL_EXEC, | 
| 2265 | 0, 0, 0, 0); | 2249 | 0, 0, 0, 0); | 
