[PATCH v2] staging: rtl8723bs: remove reduntant functions
From: Bera Yüzlü
Date: Sat Mar 21 2026 - 06:40:40 EST
GetU1ByteIntegerFromStringInDecimal() is a copy of kstrtou8().
But its only called by PHY_SetTxPowerLimit() which is only
called by odm_ConfigBB_TXPWR_LMT_8723B() which is only called
by ODM_ReadAndConfig_MP_8723B_TXPWR_LMT().
But ODM_ReadAndConfig_MP_8723B_TXPWR_LMT() didn't called anywhere
so removed:
GetU1ByteIntegerFromStringInDecimal()
PHY_SetTxPowerLimit()
odm_ConfigBB_TXPWR_LMT_8723B()
ODM_ReadAndConfig_MP_8723B_TXPWR_LMT()
Signed-off-by: Bera Yüzlü <b9788213@xxxxxxxxx>
---
V2: Removed others
V1: Removed only GetU1ByteIntegerFromStringInDecimal()
V1 link: https://lore.kernel.org/linux-staging/ab2fZaBu_5EJieMq@ashevche-desk.local/T/#u
.../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 200 ------------------
drivers/staging/rtl8723bs/hal/hal_com.c | 19 --
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 53 -----
.../rtl8723bs/hal/odm_RegConfig8723B.c | 21 --
.../rtl8723bs/hal/odm_RegConfig8723B.h | 9 -
drivers/staging/rtl8723bs/include/hal_com.h | 2 -
.../rtl8723bs/include/hal_com_phycfg.h | 3 -
7 files changed, 307 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
index 0c7d0307b822..0fb1751970d9 100644
--- a/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
+++ b/drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c
@@ -353,203 +353,3 @@ void ODM_ReadAndConfig_MP_8723B_TxPowerTrack_SDIO(struct dm_odm_t *pDM_Odm)
DELTA_SWINGIDX_SIZE
);
}
-
-/******************************************************************************
- * TXPWR_LMT.TXT
- ******************************************************************************/
-
-static u8 *Array_MP_8723B_TXPWR_LMT[] = {
- "FCC", "20M", "CCK", "1T", "01", "32",
- "ETSI", "20M", "CCK", "1T", "01", "32",
- "MKK", "20M", "CCK", "1T", "01", "32",
- "FCC", "20M", "CCK", "1T", "02", "32",
- "ETSI", "20M", "CCK", "1T", "02", "32",
- "MKK", "20M", "CCK", "1T", "02", "32",
- "FCC", "20M", "CCK", "1T", "03", "32",
- "ETSI", "20M", "CCK", "1T", "03", "32",
- "MKK", "20M", "CCK", "1T", "03", "32",
- "FCC", "20M", "CCK", "1T", "04", "32",
- "ETSI", "20M", "CCK", "1T", "04", "32",
- "MKK", "20M", "CCK", "1T", "04", "32",
- "FCC", "20M", "CCK", "1T", "05", "32",
- "ETSI", "20M", "CCK", "1T", "05", "32",
- "MKK", "20M", "CCK", "1T", "05", "32",
- "FCC", "20M", "CCK", "1T", "06", "32",
- "ETSI", "20M", "CCK", "1T", "06", "32",
- "MKK", "20M", "CCK", "1T", "06", "32",
- "FCC", "20M", "CCK", "1T", "07", "32",
- "ETSI", "20M", "CCK", "1T", "07", "32",
- "MKK", "20M", "CCK", "1T", "07", "32",
- "FCC", "20M", "CCK", "1T", "08", "32",
- "ETSI", "20M", "CCK", "1T", "08", "32",
- "MKK", "20M", "CCK", "1T", "08", "32",
- "FCC", "20M", "CCK", "1T", "09", "32",
- "ETSI", "20M", "CCK", "1T", "09", "32",
- "MKK", "20M", "CCK", "1T", "09", "32",
- "FCC", "20M", "CCK", "1T", "10", "32",
- "ETSI", "20M", "CCK", "1T", "10", "32",
- "MKK", "20M", "CCK", "1T", "10", "32",
- "FCC", "20M", "CCK", "1T", "11", "32",
- "ETSI", "20M", "CCK", "1T", "11", "32",
- "MKK", "20M", "CCK", "1T", "11", "32",
- "FCC", "20M", "CCK", "1T", "12", "63",
- "ETSI", "20M", "CCK", "1T", "12", "32",
- "MKK", "20M", "CCK", "1T", "12", "32",
- "FCC", "20M", "CCK", "1T", "13", "63",
- "ETSI", "20M", "CCK", "1T", "13", "32",
- "MKK", "20M", "CCK", "1T", "13", "32",
- "FCC", "20M", "CCK", "1T", "14", "63",
- "ETSI", "20M", "CCK", "1T", "14", "63",
- "MKK", "20M", "CCK", "1T", "14", "32",
- "FCC", "20M", "OFDM", "1T", "01", "28",
- "ETSI", "20M", "OFDM", "1T", "01", "32",
- "MKK", "20M", "OFDM", "1T", "01", "32",
- "FCC", "20M", "OFDM", "1T", "02", "28",
- "ETSI", "20M", "OFDM", "1T", "02", "32",
- "MKK", "20M", "OFDM", "1T", "02", "32",
- "FCC", "20M", "OFDM", "1T", "03", "32",
- "ETSI", "20M", "OFDM", "1T", "03", "32",
- "MKK", "20M", "OFDM", "1T", "03", "32",
- "FCC", "20M", "OFDM", "1T", "04", "32",
- "ETSI", "20M", "OFDM", "1T", "04", "32",
- "MKK", "20M", "OFDM", "1T", "04", "32",
- "FCC", "20M", "OFDM", "1T", "05", "32",
- "ETSI", "20M", "OFDM", "1T", "05", "32",
- "MKK", "20M", "OFDM", "1T", "05", "32",
- "FCC", "20M", "OFDM", "1T", "06", "32",
- "ETSI", "20M", "OFDM", "1T", "06", "32",
- "MKK", "20M", "OFDM", "1T", "06", "32",
- "FCC", "20M", "OFDM", "1T", "07", "32",
- "ETSI", "20M", "OFDM", "1T", "07", "32",
- "MKK", "20M", "OFDM", "1T", "07", "32",
- "FCC", "20M", "OFDM", "1T", "08", "32",
- "ETSI", "20M", "OFDM", "1T", "08", "32",
- "MKK", "20M", "OFDM", "1T", "08", "32",
- "FCC", "20M", "OFDM", "1T", "09", "32",
- "ETSI", "20M", "OFDM", "1T", "09", "32",
- "MKK", "20M", "OFDM", "1T", "09", "32",
- "FCC", "20M", "OFDM", "1T", "10", "28",
- "ETSI", "20M", "OFDM", "1T", "10", "32",
- "MKK", "20M", "OFDM", "1T", "10", "32",
- "FCC", "20M", "OFDM", "1T", "11", "28",
- "ETSI", "20M", "OFDM", "1T", "11", "32",
- "MKK", "20M", "OFDM", "1T", "11", "32",
- "FCC", "20M", "OFDM", "1T", "12", "63",
- "ETSI", "20M", "OFDM", "1T", "12", "32",
- "MKK", "20M", "OFDM", "1T", "12", "32",
- "FCC", "20M", "OFDM", "1T", "13", "63",
- "ETSI", "20M", "OFDM", "1T", "13", "32",
- "MKK", "20M", "OFDM", "1T", "13", "32",
- "FCC", "20M", "OFDM", "1T", "14", "63",
- "ETSI", "20M", "OFDM", "1T", "14", "63",
- "MKK", "20M", "OFDM", "1T", "14", "63",
- "FCC", "20M", "HT", "1T", "01", "26",
- "ETSI", "20M", "HT", "1T", "01", "32",
- "MKK", "20M", "HT", "1T", "01", "32",
- "FCC", "20M", "HT", "1T", "02", "26",
- "ETSI", "20M", "HT", "1T", "02", "32",
- "MKK", "20M", "HT", "1T", "02", "32",
- "FCC", "20M", "HT", "1T", "03", "32",
- "ETSI", "20M", "HT", "1T", "03", "32",
- "MKK", "20M", "HT", "1T", "03", "32",
- "FCC", "20M", "HT", "1T", "04", "32",
- "ETSI", "20M", "HT", "1T", "04", "32",
- "MKK", "20M", "HT", "1T", "04", "32",
- "FCC", "20M", "HT", "1T", "05", "32",
- "ETSI", "20M", "HT", "1T", "05", "32",
- "MKK", "20M", "HT", "1T", "05", "32",
- "FCC", "20M", "HT", "1T", "06", "32",
- "ETSI", "20M", "HT", "1T", "06", "32",
- "MKK", "20M", "HT", "1T", "06", "32",
- "FCC", "20M", "HT", "1T", "07", "32",
- "ETSI", "20M", "HT", "1T", "07", "32",
- "MKK", "20M", "HT", "1T", "07", "32",
- "FCC", "20M", "HT", "1T", "08", "32",
- "ETSI", "20M", "HT", "1T", "08", "32",
- "MKK", "20M", "HT", "1T", "08", "32",
- "FCC", "20M", "HT", "1T", "09", "32",
- "ETSI", "20M", "HT", "1T", "09", "32",
- "MKK", "20M", "HT", "1T", "09", "32",
- "FCC", "20M", "HT", "1T", "10", "26",
- "ETSI", "20M", "HT", "1T", "10", "32",
- "MKK", "20M", "HT", "1T", "10", "32",
- "FCC", "20M", "HT", "1T", "11", "26",
- "ETSI", "20M", "HT", "1T", "11", "32",
- "MKK", "20M", "HT", "1T", "11", "32",
- "FCC", "20M", "HT", "1T", "12", "63",
- "ETSI", "20M", "HT", "1T", "12", "32",
- "MKK", "20M", "HT", "1T", "12", "32",
- "FCC", "20M", "HT", "1T", "13", "63",
- "ETSI", "20M", "HT", "1T", "13", "32",
- "MKK", "20M", "HT", "1T", "13", "32",
- "FCC", "20M", "HT", "1T", "14", "63",
- "ETSI", "20M", "HT", "1T", "14", "63",
- "MKK", "20M", "HT", "1T", "14", "63",
- "FCC", "40M", "HT", "1T", "01", "63",
- "ETSI", "40M", "HT", "1T", "01", "63",
- "MKK", "40M", "HT", "1T", "01", "63",
- "FCC", "40M", "HT", "1T", "02", "63",
- "ETSI", "40M", "HT", "1T", "02", "63",
- "MKK", "40M", "HT", "1T", "02", "63",
- "FCC", "40M", "HT", "1T", "03", "26",
- "ETSI", "40M", "HT", "1T", "03", "32",
- "MKK", "40M", "HT", "1T", "03", "32",
- "FCC", "40M", "HT", "1T", "04", "26",
- "ETSI", "40M", "HT", "1T", "04", "32",
- "MKK", "40M", "HT", "1T", "04", "32",
- "FCC", "40M", "HT", "1T", "05", "32",
- "ETSI", "40M", "HT", "1T", "05", "32",
- "MKK", "40M", "HT", "1T", "05", "32",
- "FCC", "40M", "HT", "1T", "06", "32",
- "ETSI", "40M", "HT", "1T", "06", "32",
- "MKK", "40M", "HT", "1T", "06", "32",
- "FCC", "40M", "HT", "1T", "07", "32",
- "ETSI", "40M", "HT", "1T", "07", "32",
- "MKK", "40M", "HT", "1T", "07", "32",
- "FCC", "40M", "HT", "1T", "08", "26",
- "ETSI", "40M", "HT", "1T", "08", "32",
- "MKK", "40M", "HT", "1T", "08", "32",
- "FCC", "40M", "HT", "1T", "09", "26",
- "ETSI", "40M", "HT", "1T", "09", "32",
- "MKK", "40M", "HT", "1T", "09", "32",
- "FCC", "40M", "HT", "1T", "10", "26",
- "ETSI", "40M", "HT", "1T", "10", "32",
- "MKK", "40M", "HT", "1T", "10", "32",
- "FCC", "40M", "HT", "1T", "11", "26",
- "ETSI", "40M", "HT", "1T", "11", "32",
- "MKK", "40M", "HT", "1T", "11", "32",
- "FCC", "40M", "HT", "1T", "12", "63",
- "ETSI", "40M", "HT", "1T", "12", "32",
- "MKK", "40M", "HT", "1T", "12", "32",
- "FCC", "40M", "HT", "1T", "13", "63",
- "ETSI", "40M", "HT", "1T", "13", "32",
- "MKK", "40M", "HT", "1T", "13", "32",
- "FCC", "40M", "HT", "1T", "14", "63",
- "ETSI", "40M", "HT", "1T", "14", "63",
- "MKK", "40M", "HT", "1T", "14", "63"
-};
-
-void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm)
-{
- u32 i = 0;
- u8 **Array = Array_MP_8723B_TXPWR_LMT;
-
- for (i = 0; i < ARRAY_SIZE(Array_MP_8723B_TXPWR_LMT); i += 6) {
- u8 *regulation = Array[i];
- u8 *bandwidth = Array[i+1];
- u8 *rate = Array[i+2];
- u8 *rfPath = Array[i+3];
- u8 *chnl = Array[i+4];
- u8 *val = Array[i+5];
-
- odm_ConfigBB_TXPWR_LMT_8723B(
- pDM_Odm,
- regulation,
- bandwidth,
- rate,
- rfPath,
- chnl,
- val
- );
- }
-}
diff --git a/drivers/staging/rtl8723bs/hal/hal_com.c b/drivers/staging/rtl8723bs/hal/hal_com.c
index 50370b14ce7c..4f4a430c9f87 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com.c
@@ -751,25 +751,6 @@ void SetHalODMVar(
}
}
-
-bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt)
-{
- u16 i = 0;
- *pInt = 0;
-
- while (Str[i] != '\0') {
- if (Str[i] >= '0' && Str[i] <= '9') {
- *pInt *= 10;
- *pInt += (Str[i] - '0');
- } else
- return false;
-
- ++i;
- }
-
- return true;
-}
-
void rtw_hal_check_rxfifo_full(struct adapter *adapter)
{
/* switch counter to RX fifo */
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index bdd595a99b98..4a3eb6d79f33 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -805,59 +805,6 @@ void PHY_InitTxPowerLimit(struct adapter *Adapter)
}
}
-void PHY_SetTxPowerLimit(
- struct adapter *Adapter,
- u8 *Regulation,
- u8 *Bandwidth,
- u8 *RateSection,
- u8 *RfPath,
- u8 *Channel,
- u8 *PowerLimit
-)
-{
- struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- u8 regulation = 0, bandwidth = 0, rateSection = 0, channel;
- s8 powerLimit = 0, prevPowerLimit, channelIndex;
-
- GetU1ByteIntegerFromStringInDecimal((s8 *)Channel, &channel);
- GetU1ByteIntegerFromStringInDecimal((s8 *)PowerLimit, &powerLimit);
-
- powerLimit = powerLimit > MAX_POWER_INDEX ? MAX_POWER_INDEX : powerLimit;
-
- if (strcmp(Regulation, "FCC") == 0)
- regulation = 0;
- else if (strcmp(Regulation, "MKK") == 0)
- regulation = 1;
- else if (strcmp(Regulation, "ETSI") == 0)
- regulation = 2;
- else if (strcmp(Regulation, "WW13") == 0)
- regulation = 3;
-
- if (strcmp(RateSection, "CCK") == 0 && strcmp(RfPath, "1T") == 0)
- rateSection = 0;
- else if (strcmp(RateSection, "OFDM") == 0 && strcmp(RfPath, "1T") == 0)
- rateSection = 1;
- else if (strcmp(RateSection, "HT") == 0 && strcmp(RfPath, "1T") == 0)
- rateSection = 2;
- else
- return;
-
- if (strcmp(Bandwidth, "20M") == 0)
- bandwidth = 0;
- else if (strcmp(Bandwidth, "40M") == 0)
- bandwidth = 1;
-
- channelIndex = phy_GetChannelIndexOfTxPowerLimit(channel);
-
- if (channelIndex == -1)
- return;
-
- prevPowerLimit = pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelIndex][RF_PATH_A];
-
- if (powerLimit < prevPowerLimit)
- pHalData->TxPwrLimit_2_4G[regulation][bandwidth][rateSection][channelIndex][RF_PATH_A] = powerLimit;
-}
-
void Hal_ChannelPlanToRegulation(struct adapter *Adapter, u16 ChannelPlan)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
index b0ca46aec1a5..90296eb806cb 100644
--- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
+++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
@@ -154,24 +154,3 @@ void odm_ConfigBB_PHY_8723B(
/* Add 1us delay between BB/RF register setting. */
udelay(1);
}
-
-void odm_ConfigBB_TXPWR_LMT_8723B(
- struct dm_odm_t *pDM_Odm,
- u8 *Regulation,
- u8 *Bandwidth,
- u8 *RateSection,
- u8 *RfPath,
- u8 *Channel,
- u8 *PowerLimit
-)
-{
- PHY_SetTxPowerLimit(
- pDM_Odm->Adapter,
- Regulation,
- Bandwidth,
- RateSection,
- RfPath,
- Channel,
- PowerLimit
- );
-}
diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
index fba7053ee3e1..c9b56d4d85c3 100644
--- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
+++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h
@@ -33,13 +33,4 @@ void odm_ConfigBB_PHY_8723B(struct dm_odm_t *pDM_Odm,
u32 Data
);
-void odm_ConfigBB_TXPWR_LMT_8723B(struct dm_odm_t *pDM_Odm,
- u8 *Regulation,
- u8 *Bandwidth,
- u8 *RateSection,
- u8 *RfPath,
- u8 *Channel,
- u8 *PowerLimit
-);
-
#endif
diff --git a/drivers/staging/rtl8723bs/include/hal_com.h b/drivers/staging/rtl8723bs/include/hal_com.h
index 483f0390addc..7c67fee148fa 100644
--- a/drivers/staging/rtl8723bs/include/hal_com.h
+++ b/drivers/staging/rtl8723bs/include/hal_com.h
@@ -141,8 +141,6 @@ void rtw_hal_check_rxfifo_full(struct adapter *adapter);
u8 GetHalDefVar(struct adapter *adapter, enum hal_def_variable variable,
void *value);
-bool GetU1ByteIntegerFromStringInDecimal(char *str, u8 *in);
-
#define HWSET_MAX_SIZE 512
void rtw_bb_rf_gain_offset(struct adapter *padapter);
diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
index cb7c7ed74146..6aac5394f1ca 100644
--- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
+++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h
@@ -94,9 +94,6 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 RegPwrTblSel,
enum channel_width Bandwidth, u8 RfPath, u8 DataRate,
u8 Channel);
-void PHY_SetTxPowerLimit(struct adapter *Adapter, u8 *Regulation, u8 *Bandwidth,
- u8 *RateSection, u8 *RfPath, u8 *Channel, u8 *PowerLimit);
-
void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter);
void PHY_InitTxPowerLimit(struct adapter *Adapter);
--
2.53.0