From b9c1def24bec59be2e157ef5f68de6e84fd3b306 Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Mon, 1 Jul 2019 11:53:03 +0530 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 ----- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +++--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index dd0aee1fa663..ab796ee12694 100644 --- 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 179f96897855..aebbed4f3a54 100644 --- 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 d505ccebad40..544e799d0a03 100644 --- 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;