[PATCH 40/61] staging: rtl8723bs: remove EXhalbtc8723b2ant_InitHwConfig
From: Arsenii Pashchenko
Date: Wed Jul 15 2026 - 09:00:20 EST
Remove the useless external wrapper function
EXhalbtc8723b2ant_InitHwConfig. Call the internal function
halbtc8723b2ant_InitHwConfig directly with a hardcoded true
argument to match the original behavior and clean up the code.
Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 11 ++++-------
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 3 ++-
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +-
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
index f1d8e01bb..efb0ffd54 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
@@ -2289,7 +2289,7 @@ static void halbtc8723b2ant_WifiOffHwCfg(struct btc_coexist *pBtCoexist)
pBtCoexist->fBtcWrite1ByteBitMask(pBtCoexist, 0x67, 0x20, 0x1); /* BT select s0/s1 is controlled by WiFi */
}
-static void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bBackUp)
+void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist)
{
u8 u1Tmp = 0;
@@ -2373,10 +2373,7 @@ void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist)
}
}
-void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bWifiOnly)
-{
- halbtc8723b2ant_InitHwConfig(pBtCoexist, true);
-}
+
@@ -2389,7 +2386,7 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)
halbtc8723b2ant_CoexAllOff(pBtCoexist);
} else if (type == BTC_IPS_LEAVE) {
pCoexSta->bUnderIps = false;
- halbtc8723b2ant_InitHwConfig(pBtCoexist, false);
+ halbtc8723b2ant_InitHwConfig(pBtCoexist);
halbtc8723b2ant_InitCoexDm(pBtCoexist);
halbtc8723b2ant_QueryBtInfo(pBtCoexist);
}
@@ -2596,7 +2593,7 @@ void EXhalbtc8723b2ant_PnpNotify(struct btc_coexist *pBtCoexist, u8 pnpState)
{
if (pnpState == BTC_WIFI_PNP_SLEEP) {
} else if (pnpState == BTC_WIFI_PNP_WAKE_UP) {
- halbtc8723b2ant_InitHwConfig(pBtCoexist, false);
+ halbtc8723b2ant_InitHwConfig(pBtCoexist);
halbtc8723b2ant_InitCoexDm(pBtCoexist);
halbtc8723b2ant_QueryBtInfo(pBtCoexist);
}
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h
index b0e24c69d..4043e4e4d 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h
@@ -130,7 +130,6 @@ struct coex_sta_8723b_2ant {
/* The following is interface which will notify coex module. */
/* */
void EXhalbtc8723b2ant_PowerOnSetting(struct btc_coexist *pBtCoexist);
-void EXhalbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist, bool bWifiOnly);
void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type);
void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type);
void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type);
@@ -143,3 +142,5 @@ void EXhalbtc8723b2ant_BtInfoNotify(
void EXhalbtc8723b2ant_HaltNotify(struct btc_coexist *pBtCoexist);
void EXhalbtc8723b2ant_PnpNotify(struct btc_coexist *pBtCoexist, u8 pnpState);
void EXhalbtc8723b2ant_Periodical(struct btc_coexist *pBtCoexist);
+
+void halbtc8723b2ant_InitHwConfig(struct btc_coexist *pBtCoexist);
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index a975e3393..c2d355ef1 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -833,7 +833,7 @@ void EXhalbtcoutsrc_InitHwConfig(struct btc_coexist *pBtCoexist, u8 bWifiOnly)
pBtCoexist->statistics.cntInitHwConfig++;
if (pBtCoexist->boardInfo.btdmAntNum == 2)
- EXhalbtc8723b2ant_InitHwConfig(pBtCoexist, bWifiOnly);
+ halbtc8723b2ant_InitHwConfig(pBtCoexist);
else if (pBtCoexist->boardInfo.btdmAntNum == 1)
EXhalbtc8723b1ant_InitHwConfig(pBtCoexist, bWifiOnly);
}
--
2.55.0