Commit fda6c767 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove empty if-else blocks after BTC_PRINT removal 



remove if-else blocks left empty after BTC_PRINT removal.

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/102455368fa9535dc78584d7d24cd12ee4160737.1619794331.git.fabioaiuto83@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e30fb99

drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c

+1 −15
Original line number Original line Diff line number Diff line
@@ -606,8 +606,7 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) 
				pBtLinkInfo->bPanExist &&

				pBtLinkInfo->bPanExist &&

				pBtLinkInfo->bA2dpExist

				pBtLinkInfo->bA2dpExist

			) {

			) {

				if (bBtHsOn) {

				if (!bBtHsOn) {

				} else {

					algorithm = BT_8723B_1ANT_COEX_ALGO_PANEDR_HID;

					algorithm = BT_8723B_1ANT_COEX_ALGO_PANEDR_HID;

				}

				}

			}

			}
@@ -1063,10 +1062,6 @@ static void halbtc8723b1ant_PsTdma( 




	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_WIFI_BUSY, &bWifiBusy);





	if (pCoexDm->bCurPsTdmaOn) {

	} else {

	}



	if (!bForceExec) {

	if (!bForceExec) {

		if (

		if (

			(pCoexDm->bPrePsTdmaOn == pCoexDm->bCurPsTdmaOn) &&

			(pCoexDm->bPrePsTdmaOn == pCoexDm->bCurPsTdmaOn) &&
@@ -1373,10 +1368,6 @@ static bool halbtc8723b1ant_IsCommonAction(struct btc_coexist *pBtCoexist) 




		bCommon = true;

		bCommon = true;

	} else {

	} else {

		if (bWifiBusy) {

		} else {

		}



		bCommon = false;

		bCommon = false;

	}

	}
@@ -1528,7 +1519,6 @@ static void halbtc8723b1ant_TdmaDurationAdjustForAcl( 
				halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 1);

				halbtc8723b1ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, 1);

				pCoexDm->psTdmaDuAdjType = 1;

				pCoexDm->psTdmaDuAdjType = 1;

			}

			}

		} else {	  /* no change */

		}

		}





		if (

		if (
@@ -3012,10 +3002,6 @@ void EXhalbtc8723b1ant_BtInfoNotify( 
		pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i];

		pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i];

		if (i == 1)

		if (i == 1)

			btInfo = tmpBuf[i];

			btInfo = tmpBuf[i];

		if (i == length - 1)

			{}

		else

			{}

	}

	}





	if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) {

	if (BT_INFO_SRC_8723B_1ANT_WIFI_FW != rspSource) {

drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -1621,8 +1621,7 @@ static void halbtc8723b2ant_TdmaDurationAdjust( 




		if (!bScan && !bLink && !bRoam)

		if (!bScan && !bLink && !bRoam)

			halbtc8723b2ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, pCoexDm->psTdmaDuAdjType);

			halbtc8723b2ant_PsTdma(pBtCoexist, NORMAL_EXEC, true, pCoexDm->psTdmaDuAdjType);

		else {



		}

	}

	}

}

}
@@ -2859,10 +2858,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type 
	u8 wifiCentralChnl;

	u8 wifiCentralChnl;

	u8 apNum = 0;

	u8 apNum = 0;





	if (BTC_MEDIA_CONNECT == type) {

	} else {

	}



	/*  only 2.4G we need to inform bt the chnl mask */

	/*  only 2.4G we need to inform bt the chnl mask */

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, &wifiCentralChnl);

	pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_U1_WIFI_CENTRAL_CHNL, &wifiCentralChnl);

	if ((BTC_MEDIA_CONNECT == type) && (wifiCentralChnl <= 14)) {

	if ((BTC_MEDIA_CONNECT == type) && (wifiCentralChnl <= 14)) {
@@ -2889,8 +2884,6 @@ void EXhalbtc8723b2ant_MediaStatusNotify(struct btc_coexist *pBtCoexist, u8 type 




void EXhalbtc8723b2ant_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 type)

void EXhalbtc8723b2ant_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 type)

{

{

	if (type == BTC_PACKET_DHCP) {

	}

}

}





void EXhalbtc8723b2ant_BtInfoNotify(

void EXhalbtc8723b2ant_BtInfoNotify(
@@ -2915,9 +2908,6 @@ void EXhalbtc8723b2ant_BtInfoNotify( 
		if (i == 1)

		if (i == 1)

			btInfo = tmpBuf[i];

			btInfo = tmpBuf[i];





		if (i == length - 1) {

		} else {

		}

	}

	}





	if (pBtCoexist->bManualControl) {

	if (pBtCoexist->bManualControl) {