From: Nishka Dasgupta Date: Mon, 1 Jul 2019 06:22:59 +0000 (+0530) Subject: staging: rtl8723bs: Remove rtw_btcoex_IpsNotify() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4c1bcb0ee7a345539998ae99d967ddb5894253bb;p=linux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index dc4e2c806ec03..2425b9ce87127 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_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 c337a5285c684..056be46745966 100644 --- 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 d3b6851131d66..ebd51519680f1 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_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 6a8a7092f3ba5..d505ccebad40f 100644 --- 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) {