Commit d1f4b780 authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Remove rtw_btcoex_IsBtDisabled() 



Remove function rtw_btcoex_IsBtDisabled as it does nothing except call
hal_btcoex_IsBtDisabled.
Modify call sites accordingly.
Issue found wth Coccinelle.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190701091817.12759-6-nishkadg.linux@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_btcoex.c

+0 −5
Original line number Diff line number Diff line
@@ -53,11 +53,6 @@ void rtw_btcoex_HaltNotify(struct adapter *padapter) 
	hal_btcoex_HaltNotify(padapter);

}



u8 rtw_btcoex_IsBtDisabled(struct adapter *padapter)

{

	return hal_btcoex_IsBtDisabled(padapter);

}



s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter)

{

	s32 coexctrl;

drivers/staging/rtl8723bs/core/rtw_mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) 
		return;



	if (is_primary_adapter(adapter))

		DBG_871X("IsBtDisabled =%d, IsBtControlLps =%d\n", rtw_btcoex_IsBtDisabled(adapter), hal_btcoex_IsBtControlLps(adapter));

		DBG_871X("IsBtDisabled =%d, IsBtControlLps =%d\n", hal_btcoex_IsBtDisabled(adapter), hal_btcoex_IsBtControlLps(adapter));



	if ((adapter_to_pwrctl(adapter)->bFwCurrentInPSMode == true)

		&& (hal_btcoex_IsBtControlLps(adapter) == false)

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+4 −4
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
			if (pwrpriv->alives == 0)

				pslv = PS_STATE_S0;



			if ((rtw_btcoex_IsBtDisabled(padapter) == false)

			if ((hal_btcoex_IsBtDisabled(padapter) == false)

				&& (hal_btcoex_IsBtControlLps(padapter) == true)) {

				u8 val8;
@@ -910,7 +910,7 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task) 
	pwrctrl = adapter_to_pwrctl(padapter);

	pslv = PS_STATE_S0;



	if ((rtw_btcoex_IsBtDisabled(padapter) == false)

	if ((hal_btcoex_IsBtDisabled(padapter) == false)

		&& (hal_btcoex_IsBtControlLps(padapter) == true)) {

		u8 val8;
@@ -1051,7 +1051,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter) 
	pwrctrl = adapter_to_pwrctl(padapter);

	pslv = PS_STATE_S0;



	if ((rtw_btcoex_IsBtDisabled(padapter) == false)

	if ((hal_btcoex_IsBtDisabled(padapter) == false)

		&& (hal_btcoex_IsBtControlLps(padapter) == true)) {

		u8 val8;
@@ -1093,7 +1093,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter) 
	pwrctrl = adapter_to_pwrctl(padapter);

	pslv = PS_STATE_S0;



	if ((rtw_btcoex_IsBtDisabled(padapter) == false)

	if ((hal_btcoex_IsBtDisabled(padapter) == false)

		&& (hal_btcoex_IsBtControlLps(padapter) == true)) {

		u8 val8;

drivers/staging/rtl8723bs/hal/rtl8723b_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter) 


		/* ODM_CmnInfoUpdate(&pHalData->odmpriv , ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); */



		bBtDisabled = rtw_btcoex_IsBtDisabled(Adapter);

		bBtDisabled = hal_btcoex_IsBtDisabled(Adapter);



		ODM_CmnInfoUpdate(&pHalData->odmpriv, ODM_CMNINFO_BT_ENABLED, ((bBtDisabled == true)?false:true));

drivers/staging/rtl8723bs/include/rtw_btcoex.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ void rtw_btcoex_ConnectNotify(struct adapter *, u8 action); 
void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);

void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf);

void rtw_btcoex_HaltNotify(struct adapter *);

u8 rtw_btcoex_IsBtDisabled(struct adapter *);

s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *);

void rtw_btcoex_SetBTCoexist(struct adapter *, u8 bBtExist);

void rtw_btcoex_SetChipType(struct adapter *, u8 chipType);

CRA Git | Maintained and supported by SUSTech CRA and CCSE