staging: rtl8723bs: Remove function rtw_btcoex_SetDBG()

Remove function rtw_btcoex_SetDBG as all it does is call
hal_btcoex_setDBG.
Modify call sites accordingly.
Include the header file for hal_btcoex in the file that now calls
hal_btcoex_SetDBG instead of rtw_btcoex_SetDBG.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190702070132.6997-6-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 e00336ab2ee67043b27c16d884f9e6b24cb8429d..f0d61033770e10a5ede5da842737b6b7dbe3c2ef 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -43,11 +43,6 @@ void rtw_btcoex_DisplayBtCoexInfo(struct adapter *padapter, u8 *pbuf, u32 bufsiz
        hal_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize);
 }
 
-void rtw_btcoex_SetDBG(struct adapter *padapter, u32 *pDbgModule)
-{
-       hal_btcoex_SetDBG(padapter, pDbgModule);
-}
-
 u32 rtw_btcoex_GetDBG(struct adapter *padapter, u8 *pStrBuf, u32 bufSize)
 {
        return hal_btcoex_GetDBG(padapter, pStrBuf, bufSize);

diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c
index 9f8446ccf771363ecdb74078e8d6955a62f61faa..17737fb7fd886bf3c1a5b71bf6046098db38d8ad 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_debug.c
+++ b/drivers/staging/rtl8723bs/core/rtw_debug.c
@@ -8,6 +8,7 @@
 
 #include <drv_types.h>
 #include <rtw_debug.h>
+#include <hal_btcoex.h>
 
 u32 GlobalDebugLevel = _drv_err_;
 
@@ -1410,7 +1411,7 @@ ssize_t proc_set_btcoex_dbg(struct file *file, const char __user *buffer, size_t
 
        DBG_871X(FUNC_ADPT_FMT ": input 0x%08X 0x%08X\n",
                FUNC_ADPT_ARG(padapter), module[0], module[1]);
-       rtw_btcoex_SetDBG(padapter, module);
+       hal_btcoex_SetDBG(padapter, module);
 
        return count;
 }

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index 904dda178f94a3695623a6bc825306fcbbc6fe01..10273ddb81a0ffd97fb81f5ac8dba7b8fde20539 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -18,7 +18,6 @@
 void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);
 void rtw_btcoex_HaltNotify(struct adapter *);
 void rtw_btcoex_DisplayBtCoexInfo(struct adapter *, u8 *pbuf, u32 bufsize);
-void rtw_btcoex_SetDBG(struct adapter *, u32 *pDbgModule);
 u32 rtw_btcoex_GetDBG(struct adapter *, u8 *pStrBuf, u32 bufSize);
 
 /*  ================================================== */