staging: rtl8723bs: Remove rtw_btcoex_IpsNotify()

Remove function rtw_btcoex_IpsNotify as all it does is call
hal_btcoex_IpsNotify.
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 dc4e2c806ec03fd1c14373c11f2d4522a3a28c21..2425b9ce87127fad5a75f7359222c65ea29d7e6f 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -9,11 +9,6 @@
 #include <rtw_btcoex.h>
 #include <hal_btcoex.h>
 
-void rtw_btcoex_IpsNotify(struct adapter *padapter, u8 type)
-{
-       hal_btcoex_IpsNotify(padapter, type);
-}
-
 void rtw_btcoex_LpsNotify(struct adapter *padapter, u8 type)
 {
        hal_btcoex_LpsNotify(padapter, type);

diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index c337a5285c684c5a77dbbb22d86d885c09c1cb98..056be46745966db4a31f3045b49eb55c99812613 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -43,7 +43,7 @@ void ips_enter(struct adapter *padapter)
        struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
 
 
-       rtw_btcoex_IpsNotify(padapter, pwrpriv->ips_mode_req);
+       hal_btcoex_IpsNotify(padapter, pwrpriv->ips_mode_req);
 
        mutex_lock(&pwrpriv->lock);
        _ips_enter(padapter);
@@ -90,7 +90,7 @@ int ips_leave(struct adapter *padapter)
        mutex_unlock(&pwrpriv->lock);
 
        if (_SUCCESS == ret)
-               rtw_btcoex_IpsNotify(padapter, IPS_NONE);
+               hal_btcoex_IpsNotify(padapter, IPS_NONE);
 
        return ret;
 }

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index d3b6851131d664435576acd9b7022581d3e3384e..ebd51519680f1072de8258140a01b9ad0b1f8334 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -15,7 +15,6 @@
 #define        PACKET_ARP                              2
 #define        PACKET_EAPOL                    3
 
-void rtw_btcoex_IpsNotify(struct adapter *, u8 type);
 void rtw_btcoex_LpsNotify(struct adapter *, u8 type);
 void rtw_btcoex_ScanNotify(struct adapter *, u8 type);
 void rtw_btcoex_ConnectNotify(struct adapter *, u8 action);

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 6a8a7092f3ba57ab3b6cf37699dcbf6ad6ca02cb..d505ccebad40f6074b2bc3780a37620f8f82010e 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1208,7 +1208,7 @@ void rtw_dev_unload(struct adapter *padapter)
                }
 
                if (padapter->bSurpriseRemoved == false) {
-                       rtw_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
+                       hal_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
 #ifdef CONFIG_WOWLAN
                        if (pwrctl->bSupportRemoteWakeup == true &&
                                pwrctl->wowlan_mode == true) {