staging: rtl8723bs: Remove rtw_btcoex_ScanNotify()

Remove function rtw_btcoex_ScanNotify as all it does is call
hal_btcoex_ScanNotify.
Modify call sites accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190702070132.6997-3-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 ac199d7..cedc604 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_ScanNotify(struct adapter *padapter, u8 type)
-{
-       hal_btcoex_ScanNotify(padapter, type);
-}
-
 void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus)
 {
        if ((mediaStatus == RT_MEDIA_CONNECT)

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 41346b1..569a7fa 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -1463,7 +1463,7 @@ void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
        switch (lps_ctrl_type) {
        case LPS_CTRL_SCAN:
                /* DBG_871X("LPS_CTRL_SCAN\n"); */
-               rtw_btcoex_ScanNotify(padapter, true);
+               hal_btcoex_ScanNotify(padapter, true);
 
                if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
                        /*  connect */

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index ce24479..d055289 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -3876,7 +3876,7 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
        case HW_VAR_MLME_SITESURVEY:
                hw_var_set_mlme_sitesurvey(padapter, variable,  val);
 
-               rtw_btcoex_ScanNotify(padapter, *val?true:false);
+               hal_btcoex_ScanNotify(padapter, *val?true:false);
                break;
 
        case HW_VAR_MLME_JOIN:

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index f294acc..0d118e8 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_ScanNotify(struct adapter *, u8 type);
 void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);
 void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf);
 void rtw_btcoex_HaltNotify(struct adapter *);