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>

diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index ab796ee126949690040f38feb2dacd2512b74d96..e747bfa4fa8c5099a51ee0aa810af9e7ab5656d7 100644 (file)
--- 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 a4c99265bc223b801073bfab3b978531a1da5a7f..01bce255c8ca6b310152ebb3fbac7e92ba1c785f 100644 (file)
--- 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 aebbed4f3a54378d9d3b320f6b58243725bcf35f..9a020bdc5be3eb7c58e829dfdde73788b2e12592 100644 (file)
--- 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);