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>

diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index bcbe8a44107440cdb0a4a3564866258053c8f99b..734e938fbaf77c250e4a98616e5a8127f9ee0809 100644 (file)
--- 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 1ebde6e8880a8a88c2865c0c82b7ba9c424902ec..34adf5789c982b9c3de6ef39f72a84f426dd6524 100644 (file)
--- 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 3fb8c65fb72a7ce92b6538170734038f4a0827f1..ae7fb7046c93de6595ed98c7965b6ac81470756a 100644 (file)
--- 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 65781477cac9ebcf6ed3f8ba0b88a0d1209fec62..939cb3e6b009ba897ab83bae2d0fa2b752b9c3ef 100644 (file)
--- 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 7b4cc8505a38eace56c5add057ff0aee11270343..3b7f97f5b4c4fe4776318d11b4e7b6066a0cd8b5 100644 (file)
--- 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);