[PATCH 48/61] staging: rtl8723bs: remove PHY_TxPowerByRateConfiguration wrapper

[Arsenii Pashchenko]

Remove the single-use function PHY_TxPowerByRateConfiguration. Inline
its code directly at the call site, along with the relevant block
comment, to eliminate an unnecessary redirection layer and clean up
the overall driver flow.

Signed-off-by: Arsenii Pashchenko <ulijg308@xxxxxxxxx>
---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c     | 13 ++-----------
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c    |  7 ++++---
 drivers/staging/rtl8723bs/include/hal_com_phycfg.h |  1 -
 drivers/staging/rtl8723bs/include/rtl8723b_hal.h   |  4 ++++
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index 21b9d1c82..32b69ba3b 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -60,7 +60,7 @@ phy_SetTxPowerByRateBase(struct adapter *Adapter, u8 RfPath,
 	}
 }
 
-static void phy_StoreTxPowerByRateBase(struct adapter *padapter)
+void phy_StoreTxPowerByRateBase(struct adapter *padapter)
 {
 	u8 path, base;
 
@@ -367,7 +367,7 @@ void PHY_StoreTxPowerByRate(
 	}
 }
 
-static void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapter)
+void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapter)
 {
 	u8 base = 0;
 	u8 i = 0;
@@ -408,15 +408,6 @@ static void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapt
 	}
 }
 
-/*
- * This function must be called if the value in the PHY_REG_PG.txt(or header)
- * is exact dBm values
- */
-void PHY_TxPowerByRateConfiguration(struct adapter *padapter)
-{
-	phy_StoreTxPowerByRateBase(padapter);
-	phy_ConvertTxPowerByRateInDbmToRelativeValues(padapter);
-}
 
 void PHY_SetTxPowerIndexByRateSection(
 	struct adapter *padapter, u8 RFPath, u8 Channel, u8 RateSection
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index d6369eb7b..75d01e730 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -346,9 +346,10 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
 	   pHalData->EEPROMRegulatory != 2)) {
 		ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG);
 
-		if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE)
-			PHY_TxPowerByRateConfiguration(Adapter);
-
+		if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE) {
+			phy_StoreTxPowerByRateBase(Adapter);
+			phy_ConvertTxPowerByRateInDbmToRelativeValues(Adapter);
+		}
 		if (Adapter->registrypriv.reg_enable_tx_power_limit == 1 ||
 		    (Adapter->registrypriv.reg_enable_tx_power_limit == 2 &&
 		   pHalData->EEPROMRegulatory == 1))
diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index cb7c7ed74..2dde01c2a 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -85,7 +85,6 @@ void PHY_InitTxPowerByRate(struct adapter *padapter);
 void PHY_StoreTxPowerByRate(struct adapter *padapter, u32 RfPath,
 			    u32	RegAddr, u32 BitMask, u32 Data);
 
-void PHY_TxPowerByRateConfiguration(struct adapter *padapter);
 
 u8 PHY_GetTxPowerIndexBase(struct adapter *padapter, u8 RFPath, u8 Rate,
 			   enum channel_width BandWidth, u8 Channel);
diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h
index b6006110a..fe6401c4f 100644
--- a/drivers/staging/rtl8723bs/include/rtl8723b_hal.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_hal.h
@@ -239,4 +239,8 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *pC2hEvent);
 void Hal_ReadRFGainOffset(struct adapter *padapter, u8 *hwinfo,
 			  bool AutoLoadFail);
 
+
+void phy_StoreTxPowerByRateBase(struct adapter *padapter);
+void phy_ConvertTxPowerByRateInDbmToRelativeValues(struct adapter *padapter);
+
 #endif
-- 
2.55.0