Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac0ca72c authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: btcoexist: Fix if == else warnings in halbtc8821a2ant.c 



The 0-DAY kernel test infrastructure reports the following:
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3023:1-3: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3035:2-4: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3037:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3047:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3075:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3085:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3129:1-3: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3141:2-4: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3143:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3153:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3179:2-4: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3181:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:3192:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2677:1-3: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2833:1-3: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2847:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2857:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2885:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2895:3-5: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2940:1-3: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2788:2-4: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2391:2-4: WARNING: possible condition with no effect (if == else)
drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c:2417:2-4: WARNING: possible condition with no effect (if == else)

Reported-by: default avatar <kbuild-all@01.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2447e2ca

drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8821a2ant.c

+24 −161
Original line number Diff line number Diff line
@@ -2388,14 +2388,8 @@ static void halbtc8821a2ant_action_sco(struct btc_coexist *btcoexist) 
		 * halbtc8821a2ant_ps_tdma(btcoexist, NORMAL_EXEC, true, 5);

		 */



		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			halbtc8821a2ant_ps_tdma(btcoexist, NORMAL_EXEC,

						false, 0); /*for voice quality*/

		} else {

		halbtc8821a2ant_ps_tdma(btcoexist, NORMAL_EXEC,

					false, 0); /*for voice quality*/

		}



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -2785,14 +2779,7 @@ static void halbtc8821a2ant_action_pan_hs(struct btc_coexist *btcoexist) 
						   NORMAL_EXEC, false);

		}



		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			halbtc8821a2ant_ps_tdma(btcoexist, NORMAL_EXEC,

						false, 1);

		} else {

			halbtc8821a2ant_ps_tdma(btcoexist, NORMAL_EXEC,

						false, 1);

		}

		halbtc8821a2ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 1);



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -2830,40 +2817,18 @@ static void halbtc8821a2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist) 


	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);



	if (BTC_WIFI_BW_LEGACY == wifi_bw) {

		/* for HID at 11b/g mode */

	halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

				   0x5afa5afa, 0xffff, 0x3);

	} else {

		/* for HID quality & wifi performance balance at 11n mode */

		halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

					   0x5afa5afa, 0xffff, 0x3);

	}



	if (BTC_WIFI_BW_HT40 == wifi_bw) {

		/* fw mechanism */

		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH))

			btc8821a2ant_tdma_dur_adj(btcoexist, false,

						  false, 3);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, false,

							  false, 3);

			}

		} else {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, false,

							  true, 3);

			} else {

				/* a2dp edr rate */

		else

			btc8821a2ant_tdma_dur_adj(btcoexist, false,

						  true, 3);

			}

		}



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -2881,27 +2846,10 @@ static void halbtc8821a2ant_action_pan_edr_a2dp(struct btc_coexist *btcoexist) 
	} else {

		/* fw mechanism */

		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, false,

							  false, 3);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, false,

							  false, 3);

			}

		} else {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, false,

							  true, 3);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, false,

							  true, 3);

			}

		}

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH))

			btc8821a2ant_tdma_dur_adj(btcoexist, false, false, 3);

		else

			btc8821a2ant_tdma_dur_adj(btcoexist, false, true, 3);



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -2937,15 +2885,8 @@ static void halbtc8821a2ant_action_pan_edr_hid(struct btc_coexist *btcoexist) 


	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);



	if (BTC_WIFI_BW_LEGACY == wifi_bw) {

		/* for HID at 11b/g mode */

		halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

					   0x5a5f5a5f, 0xffff, 0x3);

	} else {

		/* for HID quality & wifi performance balance at 11n mode */

	halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

				   0x5a5f5a5f, 0xffff, 0x3);

	}



	if (BTC_WIFI_BW_HT40 == wifi_bw) {

		halbtc8821a2ant_fw_dac_swing_lvl(btcoexist, NORMAL_EXEC, 3);
@@ -3020,40 +2961,12 @@ static void btc8821a2ant_act_hid_a2dp_pan_edr(struct btc_coexist *btcoexist) 


	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);



	if (BTC_WIFI_BW_LEGACY == wifi_bw) {

		/* for HID at 11b/g mode */

	halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

				   0x5a5a5a5a, 0xffff, 0x3);

	} else {

		/* for HID quality & wifi performance balance at 11n mode */

		halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

					   0x5a5a5a5a, 0xffff, 0x3);

	}



	if (BTC_WIFI_BW_HT40 == wifi_bw) {

		/* fw mechanism */

		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, true,

							  true, 3);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, true,

							  true, 3);

			}

		} else {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, true,

							  true, 3);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist, true,

							  true, 3);

			}

		}

		btc8821a2ant_tdma_dur_adj(btcoexist, true, true, 3);



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -3126,40 +3039,12 @@ static void halbtc8821a2ant_action_hid_a2dp(struct btc_coexist *btcoexist) 


	btcoexist->btc_get(btcoexist, BTC_GET_U4_WIFI_BW, &wifi_bw);



	if (BTC_WIFI_BW_LEGACY == wifi_bw) {

		/* for HID at 11b/g mode */

	halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

				   0x5f5b5f5b, 0xffffff, 0x3);

	} else {

		/*for HID quality & wifi performance balance at 11n mode*/

		halbtc8821a2ant_coex_table(btcoexist, NORMAL_EXEC, 0x55ff55ff,

					   0x5f5b5f5b, 0xffffff, 0x3);

	}



	if (BTC_WIFI_BW_HT40 == wifi_bw) {

		/* fw mechanism */

		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			}

		} else {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			}

		}

		btc8821a2ant_tdma_dur_adj(btcoexist, true, true, 2);



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||
@@ -3176,29 +3061,7 @@ static void halbtc8821a2ant_action_hid_a2dp(struct btc_coexist *btcoexist) 
		}

	} else {

		/* fw mechanism */

		if ((bt_rssi_state == BTC_RSSI_STATE_HIGH) ||

		    (bt_rssi_state == BTC_RSSI_STATE_STAY_HIGH)) {

			if (bt_info_ext&BIT0) {

				/* a2dp basic rate */

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);



			} else {

				/* a2dp edr rate */

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			}

		} else {

			if (bt_info_ext&BIT0) {

				/*a2dp basic rate*/

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			} else {

				/*a2dp edr rate*/

				btc8821a2ant_tdma_dur_adj(btcoexist,

							  true, true, 2);

			}

		}

		btc8821a2ant_tdma_dur_adj(btcoexist, true, true, 2);



		/* sw mechanism */

		if ((wifi_rssi_state == BTC_RSSI_STATE_HIGH) ||