staging: rtl8723bs: Remove rtw_btcoex_SetPGAntNum()

Remove function rtw_btcoex_SetPGAntNum as it does nothing except call
hal_btcoex_SetPgAntNum.
Modify call site accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190702070132.6997-1-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 915cd093a7598adbcfa09ba0660f982dd10b64f7..002d8600416672850216ddde835a1e714abb5a2f 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -57,11 +57,6 @@ s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter)
        return coexctrl;
 }
 
-void rtw_btcoex_SetPGAntNum(struct adapter *padapter, u8 antNum)
-{
-       hal_btcoex_SetPgAntNum(padapter, antNum);
-}
-
 void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath)
 {
        hal_btcoex_SetSingleAntPath(padapter, singleAntPath);

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 79929f957c60c2981ff4150d1801a2de8f8a52b5..7d9f0a3d6401a4797377c45b3b6f0b6a05f10d5d 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2696,7 +2696,7 @@ void Hal_EfuseParseBTCoexistInfo_8723B(
 
        hal_btcoex_SetBTCoexist(padapter, pHalData->EEPROMBluetoothCoexist);
        hal_btcoex_SetChipType(padapter, pHalData->EEPROMBluetoothType);
-       rtw_btcoex_SetPGAntNum(padapter, pHalData->EEPROMBluetoothAntNum == Ant_x2 ? 2 : 1);
+       hal_btcoex_SetPgAntNum(padapter, pHalData->EEPROMBluetoothAntNum == Ant_x2 ? 2 : 1);
        if (pHalData->EEPROMBluetoothAntNum == Ant_x1)
                rtw_btcoex_SetSingleAntPath(padapter, pHalData->ant_path);
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index 9293a6705783d1edc71a82b360c3c922c05be03e..aff2567d8f9db11e3f8ef7fb4c5f21545a261776 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -20,7 +20,6 @@ void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);
 void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf);
 void rtw_btcoex_HaltNotify(struct adapter *);
 s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *);
-void rtw_btcoex_SetPGAntNum(struct adapter *, u8 antNum);
 void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath);
 void rtw_btcoex_DisplayBtCoexInfo(struct adapter *, u8 *pbuf, u32 bufsize);
 void rtw_btcoex_SetDBG(struct adapter *, u32 *pDbgModule);