diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/core')
-rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 8 |
3 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index bcbe8a441074..734e938fbaf7 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -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; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 1ebde6e8880a..34adf5789c98 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -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) diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index 3fb8c65fb72a..ae7fb7046c93 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -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; |