staging: rtl8723bs: Remove rtw_btcoex_IQKNotify()

Remove function rtw_btcoex_IQKNotify as all it does is call
hal_btcoex_IQKNotify.
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 ae342014f157f19ac2ec36bd4e489d960bedc5e0..dc4e2c806ec03fd1c14373c11f2d4522a3a28c21 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -44,11 +44,6 @@ void rtw_btcoex_SpecialPacketNotify(struct adapter *padapter, u8 pktType)
        hal_btcoex_SpecialPacketNotify(padapter, pktType);
 }
 
-void rtw_btcoex_IQKNotify(struct adapter *padapter, u8 state)
-{
-       hal_btcoex_IQKNotify(padapter, state);
-}
-
 void rtw_btcoex_BtInfoNotify(struct adapter *padapter, u8 length, u8 *tmpBuf)
 {
        hal_btcoex_BtInfoNotify(padapter, length, tmpBuf);

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index d05f4995ff87956967674450c4348277cdc58fe4..0f5dd4629e6f180b6d948e9f2df57de513c060ba 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -991,14 +991,14 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
                                msleep(50);
                        } while (jiffies_to_msecs(jiffies - start_time) <= 400);
 
-                       rtw_btcoex_IQKNotify(padapter, true);
+                       hal_btcoex_IQKNotify(padapter, true);
 
                        restore_iqk_rst = pwrpriv->bips_processing;
                        b2Ant = pHalData->EEPROMBluetoothAntNum == Ant_x2;
                        PHY_IQCalibrate_8723B(padapter, false, restore_iqk_rst, b2Ant, pHalData->ant_path);
                        pHalData->odmpriv.RFCalibrateInfo.bIQKInitialized = true;
 
-                       rtw_btcoex_IQKNotify(padapter, false);
+                       hal_btcoex_IQKNotify(padapter, false);
 
                        /* Inform WiFi FW that it is the finish of IQK */
                        h2cCmdBuf = 0;

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index 1f4fc851effba770917184c08b9d60dcc37b90de..d3b6851131d664435576acd9b7022581d3e3384e 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -21,7 +21,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_SpecialPacketNotify(struct adapter *, u8 pktType);
-void rtw_btcoex_IQKNotify(struct adapter *padapter, u8 state);
 void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf);
 void rtw_btcoex_SuspendNotify(struct adapter *, u8 state);
 void rtw_btcoex_HaltNotify(struct adapter *);