diff options
| author |   Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-07-01 14:48:13 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-03 18:34:08 +0200 |
| commit | d1f4b78027202d8cb8a45c885038f5fd70e0eaf2 (patch) | |
| tree | 2af35cbab801a7029a8c72e5e7ab669d893e2354 /drivers | |
| parent | staging: rtl8723bs: Remove rtw_btcoex_IsBtControlLps() (diff) | |
| download | linux-dev-d1f4b78027202d8cb8a45c885038f5fd70e0eaf2.tar.xz linux-dev-d1f4b78027202d8cb8a45c885038f5fd70e0eaf2.zip | |
staging: rtl8723bs: Remove rtw_btcoex_IsBtDisabled()
Remove function rtw_btcoex_IsBtDisabled as it does nothing except call
hal_btcoex_IsBtDisabled.
Modify call sites accordingly.
Issue found wth Coccinelle.
Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190701091817.12759-6-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -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 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 |
5 files changed, 6 insertions, 12 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; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c index 65781477cac9..939cb3e6b009 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_dm.c @@ -186,7 +186,7 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter) /* ODM_CmnInfoUpdate(&pHalData->odmpriv , ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); */ - bBtDisabled = rtw_btcoex_IsBtDisabled(Adapter); + bBtDisabled = hal_btcoex_IsBtDisabled(Adapter); ODM_CmnInfoUpdate(&pHalData->odmpriv, ODM_CMNINFO_BT_ENABLED, ((bBtDisabled == true)?false:true)); diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index 7b4cc8505a38..3b7f97f5b4c4 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -20,7 +20,6 @@ void rtw_btcoex_ConnectNotify(struct adapter *, u8 action); void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus); void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf); void rtw_btcoex_HaltNotify(struct adapter *); -u8 rtw_btcoex_IsBtDisabled(struct adapter *); s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *); void rtw_btcoex_SetBTCoexist(struct adapter *, u8 bBtExist); void rtw_btcoex_SetChipType(struct adapter *, u8 chipType); |