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.li...@gmail.com>
---
 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 ab796ee12694..e747bfa4fa8c 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 a4c99265bc22..01bce255c8ca 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 aebbed4f3a54..9a020bdc5be3 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.19.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to