Remove function rtw_btcoex_SetManualControl as all it does is call hal_btcoex_SetManualControl. Modify call sites accordingly. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta <nishkadg.linux@xxxxxxxxx> --- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 ----- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 5 +++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index e94d48927373..dd0aee1fa663 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -77,11 +77,6 @@ s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter) return coexctrl; } -void rtw_btcoex_SetManualControl(struct adapter *padapter, u8 manual) -{ - hal_btcoex_SetManualControl(padapter, manual); -} - u8 rtw_btcoex_IsBtControlLps(struct adapter *padapter) { return hal_btcoex_IsBtControlLps(padapter); diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index 7c5c71fa5c9c..179f96897855 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -24,7 +24,6 @@ void rtw_btcoex_HaltNotify(struct adapter *); u8 rtw_btcoex_IsBtDisabled(struct adapter *); void rtw_btcoex_Handler(struct adapter *); s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *); -void rtw_btcoex_SetManualControl(struct adapter *, u8 bmanual); u8 rtw_btcoex_IsBtControlLps(struct adapter *); u8 rtw_btcoex_IsLpsOn(struct adapter *); u8 rtw_btcoex_RpwmVal(struct adapter *); diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c index b6ed647ed3e2..99e6b1028f71 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c @@ -10,6 +10,7 @@ #include <drv_types.h> #include <rtw_debug.h> #include <rtw_mp.h> +#include <hal_btcoex.h> #include <linux/jiffies.h> #include <linux/kernel.h> @@ -4536,10 +4537,10 @@ static int rtw_test( } if (strcmp(pch, "bton") == 0) - rtw_btcoex_SetManualControl(padapter, false); + hal_btcoex_SetManualControl(padapter, false); if (strcmp(pch, "btoff") == 0) - rtw_btcoex_SetManualControl(padapter, true); + hal_btcoex_SetManualControl(padapter, true); if (strcmp(pch, "h2c") == 0) { u8 param[8]; -- 2.19.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel