From a47a70c25777ac06c9d2e09030377cfee851edee Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Tue, 2 Jul 2019 12:31:26 +0530 Subject: 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 Link: https://lore.kernel.org/r/20190702070132.6997-3-nishkadg.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 ----- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) (limited to 'drivers/staging/rtl8723bs') diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index ac199d75ee63..cedc60401b3f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -9,11 +9,6 @@ #include #include -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 41346b101f1d..569a7fabd6cb 100644 --- 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 ce244798198e..d05528908ac7 100644 --- 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 f294acce149b..0d118e8f3389 100644 --- 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 *); -- cgit v1.2.3