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

Commit 003e6cc3 authored Jul 01, 2019 by Nishka Dasgupta Committed by Greg Kroah-Hartman Jul 01, 2019

staging: rtl8723bs: Remove rtw_btcoex_IsLpsOn()



Remove function rtw_btcoex_IsLpsOn as all it does is call
hal_btcoex_IsLpsOn.
Modify call sites accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b9c1def2

drivers/staging/rtl8723bs/core/rtw_btcoex.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -77,11 +77,6 @@ u8 rtw_btcoex_IsBtControlLps(struct adapter *padapter)
		return hal_btcoex_IsBtControlLps(padapter);
		}

		u8 rtw_btcoex_IsLpsOn(struct adapter *padapter)
		{
		return hal_btcoex_IsLpsOn(padapter);
		}

		u8 rtw_btcoex_RpwmVal(struct adapter *padapter)
		{
		return hal_btcoex_RpwmVal(padapter);

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
		&& (((rtw_btcoex_IsBtControlLps(padapter) == false)
		)
		\|\| ((rtw_btcoex_IsBtControlLps(padapter) == true)
		&& (rtw_btcoex_IsLpsOn(padapter) == false))
		&& (hal_btcoex_IsLpsOn(padapter) == false))
		)
		) {
		DBG_871X(FUNC_ADPT_FMT" Leave 802.11 power save - %s\n",
		@@ -462,7 +462,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
		} else {
		if ((PS_RDY_CHECK(padapter) && check_fwstate(&padapter->mlmepriv, WIFI_ASOC_STATE))
		\|\| ((rtw_btcoex_IsBtControlLps(padapter) == true)
		&& (rtw_btcoex_IsLpsOn(padapter) == true))
		&& (hal_btcoex_IsLpsOn(padapter) == true))
		) {
		u8 pslv;

drivers/staging/rtl8723bs/include/rtw_btcoex.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ u8 rtw_btcoex_IsBtDisabled(struct adapter *);
		void rtw_btcoex_Handler(struct adapter *);
		s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *);
		u8 rtw_btcoex_IsBtControlLps(struct adapter *);
		u8 rtw_btcoex_IsLpsOn(struct adapter *);
		u8 rtw_btcoex_RpwmVal(struct adapter *);
		u8 rtw_btcoex_LpsVal(struct adapter *);
		void rtw_btcoex_SetBTCoexist(struct adapter *, u8 bBtExist);