staging: rtl8723bs: Remove rtw_btcoex_ConnectNotify()

Remove function rtw_btcoex_ConnectNotify as all it does is call
hal_btcoex_ConnectNotify.
Modify call sites accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190701091817.12759-8-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 de8f6cae794299fd5b74e254f0bfdd87c35a1882..276aaab2781b7a56d61fae36e4fd8fea3161745c 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -14,11 +14,6 @@ void rtw_btcoex_ScanNotify(struct adapter *padapter, u8 type)
        hal_btcoex_ScanNotify(padapter, type);
 }
 
-void rtw_btcoex_ConnectNotify(struct adapter *padapter, u8 action)
-{
-       hal_btcoex_ConnectNotify(padapter, action);
-}
-
 void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus)
 {
        if ((mediaStatus == RT_MEDIA_CONNECT)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 5ce93a56ad68df2d96f6299f686411d252052b8b..934245493c882cd2d43ce2cfa17f46396fc6a1a5 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -3885,11 +3885,11 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
                switch (*val) {
                case 0:
                        /*  prepare to join */
-                       rtw_btcoex_ConnectNotify(padapter, true);
+                       hal_btcoex_ConnectNotify(padapter, true);
                        break;
                case 1:
                        /*  joinbss_event callback when join res < 0 */
-                       rtw_btcoex_ConnectNotify(padapter, false);
+                       hal_btcoex_ConnectNotify(padapter, false);
                        break;
                case 2:
                        /*  sta add event callback */

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index d5552543a490d04c66196421aefbc303bcd23823..5b15e0129cc9a6f59077332f4cba6cedfa743df2 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -16,7 +16,6 @@
 #define        PACKET_EAPOL                    3
 
 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_HaltNotify(struct adapter *);