staging: rtl8723bs: Remove rtw_btcoex_SuspendNotify()

Remove function rtw_btcoex_SuspendNotify as all it does is call
hal_btcoex_SuspendNotify.
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 dd0aee1fa66356a51ea7fff4e3e305417cda204d..ab796ee126949690040f38feb2dacd2512b74d96 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -34,11 +34,6 @@ void rtw_btcoex_BtInfoNotify(struct adapter *padapter, u8 length, u8 *tmpBuf)
        hal_btcoex_BtInfoNotify(padapter, length, tmpBuf);
 }
 
-void rtw_btcoex_SuspendNotify(struct adapter *padapter, u8 state)
-{
-       hal_btcoex_SuspendNotify(padapter, state);
-}
-
 void rtw_btcoex_HaltNotify(struct adapter *padapter)
 {
        if (!padapter->bup) {

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index 179f9689785588317dff97d454a1c070d717e3eb..aebbed4f3a54378d9d3b320f6b58243725bcf35f 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -19,7 +19,6 @@ void rtw_btcoex_ScanNotify(struct adapter *, u8 type);
 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_SuspendNotify(struct adapter *, u8 state);
 void rtw_btcoex_HaltNotify(struct adapter *);
 u8 rtw_btcoex_IsBtDisabled(struct adapter *);
 void rtw_btcoex_Handler(struct adapter *);

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index d505ccebad40f6074b2bc3780a37620f8f82010e..544e799d0a03c3bd9addf366900664d0aca72696 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1475,10 +1475,10 @@ int rtw_suspend_common(struct adapter *padapter)
 
        /*  wait for the latest FW to remove this condition. */
        if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) {
-               rtw_btcoex_SuspendNotify(padapter, 0);
+               hal_btcoex_SuspendNotify(padapter, 0);
                DBG_871X("WIFI_AP_STATE\n");
        } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == true) {
-               rtw_btcoex_SuspendNotify(padapter, 1);
+               hal_btcoex_SuspendNotify(padapter, 1);
                DBG_871X("STATION\n");
        }
 
@@ -1829,7 +1829,7 @@ int rtw_resume_common(struct adapter *padapter)
                rtw_resume_process_normal(padapter);
        }
 
-       rtw_btcoex_SuspendNotify(padapter, 0);
+       hal_btcoex_SuspendNotify(padapter, 0);
 
        if (pwrpriv) {
                pwrpriv->bInSuspend = false;