staging: rtl8723bs: Remove rtw_btcoex_HAL_Initialize()

Remove function rtw_btcoex_HAL_Initialize as it does nothing except call
hal_btcoex_InitHwConfig.
Modify call sites accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <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 b9b0328168661ace17df95cf1dbd4942f98c678a..ae342014f157f19ac2ec36bd4e489d960bedc5e0 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -9,11 +9,6 @@
 #include <rtw_btcoex.h>
 #include <hal_btcoex.h>
 
-void rtw_btcoex_HAL_Initialize(struct adapter *padapter, u8 bWifiOnly)
-{
-       hal_btcoex_InitHwConfig(padapter, bWifiOnly);
-}
-
 void rtw_btcoex_IpsNotify(struct adapter *padapter, u8 type)
 {
        hal_btcoex_IpsNotify(padapter, type);

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 33ff92ebfd8e8064b7bcf49cadd6e33a46574ea4..d05f4995ff87956967674450c4348277cdc58fe4 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -764,7 +764,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 
                rtw_hal_set_hwreg(padapter, HW_VAR_APFM_ON_MAC, &bMacPwrCtrlOn);
 
-               rtw_btcoex_HAL_Initialize(padapter, false);
+               hal_btcoex_InitHwConfig(padapter, false);
 
                return _SUCCESS;
        }
@@ -1009,7 +1009,7 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
        }
 
        /*  Init BT hw config. */
-       rtw_btcoex_HAL_Initialize(padapter, false);
+       hal_btcoex_InitHwConfig(padapter, false);
 
        RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("-%s\n", __func__));
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index 0877a6863f50ae27c51abfefa3823981a33dec88..1f4fc851effba770917184c08b9d60dcc37b90de 100644 (file)
--- 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_HAL_Initialize(struct adapter *padapter, u8 bWifiOnly);
 void rtw_btcoex_IpsNotify(struct adapter *, u8 type);
 void rtw_btcoex_LpsNotify(struct adapter *, u8 type);
 void rtw_btcoex_ScanNotify(struct adapter *, u8 type);