From 003e6cc3a22daa8ba09ac3b878d89ad8ee7cd394 Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Mon, 1 Jul 2019 11:53:04 +0530 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 ----- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++-- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index ab796ee..e747bfa4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -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); diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index a4c9926..01bce25 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -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; diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index aebbed4..9a020bd 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -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); -- 2.7.4