leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: rtl8723bs: Remove rtw_btcoex_IsBtDisabled()

Browse Source 
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>
This commit is contained in:
Nishka Dasgupta 2019-07-01 14:48:13 +05:30 committed by Greg Kroah-Hartman
parent 606e33cead
commit d1f4b78027
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/rtl8723bs/core/rtw_btcoex.c
View File

@ -53,11 +53,6 @@ void rtw_btcoex_HaltNotify(struct adapter *padapter)
hal_btcoex_HaltNotify(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 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter)
{ {
s32 coexctrl; s32 coexctrl;

2
drivers/staging/rtl8723bs/core/rtw_mlme.c
View File

@ -1889,7 +1889,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
return; return;
if (is_primary_adapter(adapter)) 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) if ((adapter_to_pwrctl(adapter)->bFwCurrentInPSMode == true)
&& (hal_btcoex_IsBtControlLps(adapter) == false) && (hal_btcoex_IsBtControlLps(adapter) == false)

8
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
View File

@ -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) if (pwrpriv->alives == 0)
pslv = PS_STATE_S0; pslv = PS_STATE_S0;
if ((rtw_btcoex_IsBtDisabled(padapter) == false) if ((hal_btcoex_IsBtDisabled(padapter) == false)
&& (hal_btcoex_IsBtControlLps(padapter) == true)) { && (hal_btcoex_IsBtControlLps(padapter) == true)) {
u8 val8; u8 val8;
@ -910,7 +910,7 @@ void rtw_unregister_task_alive(struct adapter *padapter, u32 task)
pwrctrl = adapter_to_pwrctl(padapter); pwrctrl = adapter_to_pwrctl(padapter);
pslv = PS_STATE_S0; pslv = PS_STATE_S0;
if ((rtw_btcoex_IsBtDisabled(padapter) == false) if ((hal_btcoex_IsBtDisabled(padapter) == false)
&& (hal_btcoex_IsBtControlLps(padapter) == true)) { && (hal_btcoex_IsBtControlLps(padapter) == true)) {
u8 val8; u8 val8;
@ -1051,7 +1051,7 @@ void rtw_unregister_tx_alive(struct adapter *padapter)
pwrctrl = adapter_to_pwrctl(padapter); pwrctrl = adapter_to_pwrctl(padapter);
pslv = PS_STATE_S0; pslv = PS_STATE_S0;
if ((rtw_btcoex_IsBtDisabled(padapter) == false) if ((hal_btcoex_IsBtDisabled(padapter) == false)
&& (hal_btcoex_IsBtControlLps(padapter) == true)) { && (hal_btcoex_IsBtControlLps(padapter) == true)) {
u8 val8; u8 val8;
@ -1093,7 +1093,7 @@ void rtw_unregister_cmd_alive(struct adapter *padapter)
pwrctrl = adapter_to_pwrctl(padapter); pwrctrl = adapter_to_pwrctl(padapter);
pslv = PS_STATE_S0; pslv = PS_STATE_S0;
if ((rtw_btcoex_IsBtDisabled(padapter) == false) if ((hal_btcoex_IsBtDisabled(padapter) == false)
&& (hal_btcoex_IsBtControlLps(padapter) == true)) { && (hal_btcoex_IsBtControlLps(padapter) == true)) {
u8 val8; u8 val8;

2
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c
View File

@ -186,7 +186,7 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter)
/* ODM_CmnInfoUpdate(&pHalData->odmpriv , ODM_CMNINFO_RSSI_MIN, pdmpriv->MinUndecoratedPWDBForDM); */ /* 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)); ODM_CmnInfoUpdate(&pHalData->odmpriv, ODM_CMNINFO_BT_ENABLED, ((bBtDisabled == true)?false:true));

1
drivers/staging/rtl8723bs/include/rtw_btcoex.h
View File

@ -20,7 +20,6 @@ void rtw_btcoex_ConnectNotify(struct adapter *, u8 action);
void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus); void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);
void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf); void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf);
void rtw_btcoex_HaltNotify(struct adapter *); void rtw_btcoex_HaltNotify(struct adapter *);
u8 rtw_btcoex_IsBtDisabled(struct adapter *);
s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *); s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *);
void rtw_btcoex_SetBTCoexist(struct adapter *, u8 bBtExist); void rtw_btcoex_SetBTCoexist(struct adapter *, u8 bBtExist);
void rtw_btcoex_SetChipType(struct adapter *, u8 chipType); void rtw_btcoex_SetChipType(struct adapter *, u8 chipType);