staging: rtl8723bs: rename members of struct registry_priv and remove dead code

PATCH New Ethan Tidmore 1 participant 9 messages Jan 27 Staging

Share & tools

Ethan Tidmore

author

2026-01-27 01:21 UTC #0 lore raw

v2 cover staging: rtl8723bs: rename members of struct registry_priv and remove dead code

Changes in v2:
- Split the series into one logical change per patch as requested.
- Removed unused variables (bEn_RFE, RFE_Type, etc.) instead of renaming them, resolving the Hungarian notation issue.
- Removed stray changes to function parameters to keep patches focused on struct registry_priv members.

Ethan Tidmore (8):
staging: rtl8723bs: rename RegEnableTxPowerLimit to
reg_enable_tx_power_limit
staging: rtl8723bs: rename RegEnableTxPowerByRate to
reg_enable_tx_power_by_rate
staging: rtl8723bs: rename RegPwrTblSel to reg_pwr_tbl_sel
staging: rtl8723bs: remove unused variable TxBBSwing_2G
staging: rtl8723bs: remove unused variable AmplifierType_2G
staging: rtl8723bs: remove unused variable bEn_RFE
staging: rtl8723bs: remove unused variable RFE_Type

 .../staging/rtl8723bs/hal/hal_com_phycfg.c    | 14 +++++----
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c   | 31 ++++++++-----------
 drivers/staging/rtl8723bs/include/drv_types.h | 12 +++----
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   |  9 ++----
 4 files changed, 28 insertions(+), 38 deletions(-)

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #1 lore raw

PATCH v2 1/8 staging: rtl8723bs: rename RegEnableTxPowerLimit to reg_enable_tx_power_limit

Rename RegEnableTxPowerLimit to reg_enable_tx_power_limit to avoid CamelCase.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c |  4 ++--
 .../staging/rtl8723bs/hal/rtl8723b_phycfg.c    | 18 +++++++-----------
 drivers/staging/rtl8723bs/include/drv_types.h  |  2 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c    |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +2 -2

index cd76e26e868f..403fb485b6b4 100644
@@ -690,9 +690,9 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
 	struct hal_com_data *hal_data = GET_HAL_DATA(adapter);
 	s8 limits[10] = {0}; u8 i = 0;
 
-	if (((adapter->registrypriv.RegEnableTxPowerLimit == 2) &&
+	if (((adapter->registrypriv.reg_enable_tx_power_limit == 2) &&
 	     (hal_data->EEPROMRegulatory != 1)) ||
-	    (adapter->registrypriv.RegEnableTxPowerLimit == 0))
+	    (adapter->registrypriv.reg_enable_tx_power_limit == 0))
 		return MAX_POWER_INDEX;
 
 	switch (adapter->registrypriv.RegPwrTblSel) {

drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +7 ~~-11~~

index d8709d40cb33..e89e34a6ad8c 100644
@@ -338,13 +338,10 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
 
 	/*  Read Tx Power Limit File */
 	PHY_InitTxPowerLimit(Adapter);
-	if (
-		Adapter->registrypriv.RegEnableTxPowerLimit == 1 ||
-		(Adapter->registrypriv.RegEnableTxPowerLimit == 2 && pHalData->EEPROMRegulatory == 1)
-	) {
-		ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv,
-					   CONFIG_RF_TXPWR_LMT, 0);
-	}
+	if (Adapter->registrypriv.reg_enable_tx_power_limit == 1 ||
+	    (Adapter->registrypriv.reg_enable_tx_power_limit == 2 &&
+	   pHalData->EEPROMRegulatory == 1))
+		ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_TXPWR_LMT, 0);
 
 	/*  */
 	/*  1. Read PHY_REG.TXT BB INIT!! */

@@ -363,10 +360,9 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
 		if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE)
 			PHY_TxPowerByRateConfiguration(Adapter);
 
-		if (
-			Adapter->registrypriv.RegEnableTxPowerLimit == 1 ||
-			(Adapter->registrypriv.RegEnableTxPowerLimit == 2 && pHalData->EEPROMRegulatory == 1)
-		)
+		if (Adapter->registrypriv.reg_enable_tx_power_limit == 1 ||
+		    (Adapter->registrypriv.reg_enable_tx_power_limit == 2 &&
+		   pHalData->EEPROMRegulatory == 1))
 			PHY_ConvertTxPowerLimitToPowerIndex(Adapter);
 	}

drivers/staging/rtl8723bs/include/drv_types.h +1 -1

index f86180dc350c..4e164bec6f4d 100644
@@ -156,7 +156,7 @@ struct registry_priv {
 	u8 notch_filter;
 
 	/* define for tx power adjust */
-	u8 RegEnableTxPowerLimit;
+	u8 reg_enable_tx_power_limit;
 	u8 RegEnableTxPowerByRate;
 	u8 RegPowerBase;
 	u8 RegPwrTblSel;

drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1

index bc02db13781c..725f1da80d32 100644
@@ -259,7 +259,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 
 	registry_par->notch_filter = (u8)rtw_notch_filter;
 
-	registry_par->RegEnableTxPowerLimit = (u8)rtw_tx_pwr_lmt_enable;
+	registry_par->reg_enable_tx_power_limit = (u8)rtw_tx_pwr_lmt_enable;
 	registry_par->RegEnableTxPowerByRate = (u8)rtw_tx_pwr_by_rate;
 
 	registry_par->RegPowerBase = 14;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #2 lore raw

PATCH v2 2/8 staging: rtl8723bs: rename RegEnableTxPowerByRate to reg_enable_tx_power_by_rate

In reply to Ethan Tidmore

Rename RegEnableTxPowerByRate to reg_enable_tx_power_by_rate to
avoid CamelCase.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c  |  5 +++--
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 11 +++++------
 drivers/staging/rtl8723bs/include/drv_types.h   |  2 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +3 -2

index 403fb485b6b4..e7e355b41747 100644
@@ -573,8 +573,9 @@ s8 PHY_GetTxPowerByRate(struct adapter *padapter, u8 RFPath, u8 Rate)
 	s8 value = 0;
 	u8 rateIndex = PHY_GetRateIndexOfTxPowerByRate(Rate);
 
-	if ((padapter->registrypriv.RegEnableTxPowerByRate == 2 && pHalData->EEPROMRegulatory == 2) ||
-		   padapter->registrypriv.RegEnableTxPowerByRate == 0)
+	if ((padapter->registrypriv.reg_enable_tx_power_by_rate == 2 &&
+	     pHalData->EEPROMRegulatory == 2) ||
+	   padapter->registrypriv.reg_enable_tx_power_by_rate == 0)
 		return 0;
 
 	if (RFPath >= RF_PATH_MAX)

drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +5 -6

index e89e34a6ad8c..95ddb34850bc 100644
@@ -350,12 +350,11 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
 
 	/*  If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */
 	PHY_InitTxPowerByRate(Adapter);
-	if (
-		Adapter->registrypriv.RegEnableTxPowerByRate == 1 ||
-		(Adapter->registrypriv.RegEnableTxPowerByRate == 2 && pHalData->EEPROMRegulatory != 2)
-	) {
-		ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv,
-					   CONFIG_BB_PHY_REG_PG);
+
+	if (Adapter->registrypriv.reg_enable_tx_power_by_rate == 1 ||
+	    (Adapter->registrypriv.reg_enable_tx_power_by_rate == 2 &&
+	   pHalData->EEPROMRegulatory != 2)) {
+		ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG);
 
 		if (pHalData->odmpriv.PhyRegPgValueType == PHY_REG_PG_EXACT_VALUE)
 			PHY_TxPowerByRateConfiguration(Adapter);

drivers/staging/rtl8723bs/include/drv_types.h +1 -1

index 4e164bec6f4d..847f29c7f3be 100644
@@ -157,7 +157,7 @@ struct registry_priv {
 
 	/* define for tx power adjust */
 	u8 reg_enable_tx_power_limit;
-	u8 RegEnableTxPowerByRate;
+	u8 reg_enable_tx_power_by_rate;
 	u8 RegPowerBase;
 	u8 RegPwrTblSel;
 	s8	TxBBSwing_2G;

drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1

index 725f1da80d32..1558045f9366 100644
@@ -260,7 +260,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 	registry_par->notch_filter = (u8)rtw_notch_filter;
 
 	registry_par->reg_enable_tx_power_limit = (u8)rtw_tx_pwr_lmt_enable;
-	registry_par->RegEnableTxPowerByRate = (u8)rtw_tx_pwr_by_rate;
+	registry_par->reg_enable_tx_power_by_rate = (u8)rtw_tx_pwr_by_rate;
 
 	registry_par->RegPowerBase = 14;
 	registry_par->TxBBSwing_2G = 0xFF;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #3 lore raw

PATCH v2 3/8 staging: rtl8723bs: rename RegPowerBase to reg_power_base

In reply to Ethan Tidmore

Rename RegPowerBase to reg_power_base to avoid CamelCase.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 3 ++-
 drivers/staging/rtl8723bs/include/drv_types.h  | 2 +-
 drivers/staging/rtl8723bs/os_dep/os_intfs.c    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +2 -1

index e7e355b41747..1a9a4bb15bd8 100644
@@ -752,6 +752,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
 void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter)
 {
 	struct hal_com_data	*pHalData = GET_HAL_DATA(Adapter);
+	struct registry_priv *r = &Adapter->registrypriv;
 	u8 BW40PwrBasedBm2_4G = 0x2E;
 	u8 regulation, bw, channel, rateSection;
 	s8 tempValue = 0, tempPwrLmt = 0;

@@ -772,7 +773,7 @@ void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter)
 							else if (rateSection == 0) /*  CCK */
 								BW40PwrBasedBm2_4G = PHY_GetTxPowerByRateBase(Adapter, rfPath, CCK);
 						} else
-							BW40PwrBasedBm2_4G = Adapter->registrypriv.RegPowerBase * 2;
+							BW40PwrBasedBm2_4G = r->reg_power_base * 2;
 
 						if (tempPwrLmt != MAX_POWER_INDEX) {
 							tempValue = tempPwrLmt - BW40PwrBasedBm2_4G;

drivers/staging/rtl8723bs/include/drv_types.h +1 -1

index 847f29c7f3be..e1efc14e86af 100644
@@ -158,7 +158,7 @@ struct registry_priv {
 	/* define for tx power adjust */
 	u8 reg_enable_tx_power_limit;
 	u8 reg_enable_tx_power_by_rate;
-	u8 RegPowerBase;
+	u8 reg_power_base;
 	u8 RegPwrTblSel;
 	s8	TxBBSwing_2G;
 	u8 AmplifierType_2G;

drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1

index 1558045f9366..02e01f0f0bf4 100644
@@ -262,7 +262,7 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 	registry_par->reg_enable_tx_power_limit = (u8)rtw_tx_pwr_lmt_enable;
 	registry_par->reg_enable_tx_power_by_rate = (u8)rtw_tx_pwr_by_rate;
 
-	registry_par->RegPowerBase = 14;
+	registry_par->reg_power_base = 14;
 	registry_par->TxBBSwing_2G = 0xFF;
 	registry_par->bEn_RFE = 1;
 	registry_par->RFE_Type = 64;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #4 lore raw

PATCH v2 4/8 staging: rtl8723bs: rename RegPwrTblSel to reg_pwr_tbl_sel

In reply to Ethan Tidmore

Rename RegPwrTblSel to reg_pwr_tbl_sel to avoid CamelCase.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c  | 2 +-
 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +-
 drivers/staging/rtl8723bs/include/drv_types.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +1 -1

index 1a9a4bb15bd8..dc2da49e6738 100644
@@ -696,7 +696,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
 	    (adapter->registrypriv.reg_enable_tx_power_limit == 0))
 		return MAX_POWER_INDEX;
 
-	switch (adapter->registrypriv.RegPwrTblSel) {
+	switch (adapter->registrypriv.reg_pwr_tbl_sel) {
 	case 1:
 		idx_regulation = TXPWR_LMT_ETSI;
 		break;

drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +1 -1

index 95ddb34850bc..6d5e531505f9 100644
@@ -536,7 +536,7 @@ u8 PHY_GetTxPowerIndex(
 
 	limit = phy_get_tx_pwr_lmt(
 		padapter,
-		padapter->registrypriv.RegPwrTblSel,
+		padapter->registrypriv.reg_pwr_tbl_sel,
 		pHalData->CurrentChannelBW,
 		RFPath,
 		Rate,

drivers/staging/rtl8723bs/include/drv_types.h +1 -1

index e1efc14e86af..3557d7365585 100644
@@ -159,7 +159,7 @@ struct registry_priv {
 	u8 reg_enable_tx_power_limit;
 	u8 reg_enable_tx_power_by_rate;
 	u8 reg_power_base;
-	u8 RegPwrTblSel;
+	u8 reg_pwr_tbl_sel;
 	s8	TxBBSwing_2G;
 	u8 AmplifierType_2G;
 	u8 bEn_RFE;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #5 lore raw

PATCH v2 5/8 staging: rtl8723bs: remove unused variable TxBBSwing_2G

In reply to Ethan Tidmore

The variable TxBBSwing_2G is initialized but never read or used anywhere in the driver. Remove it to clean up dead code and fix a CamelCase warning.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/include/drv_types.h | 1 -
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   | 1 -
 2 files changed, 2 deletions(-)

drivers/staging/rtl8723bs/include/drv_types.h +0 -1

index 3557d7365585..cbbdf45012c4 100644
@@ -160,7 +160,6 @@ struct registry_priv {
 	u8 reg_enable_tx_power_by_rate;
 	u8 reg_power_base;
 	u8 reg_pwr_tbl_sel;
-	s8	TxBBSwing_2G;
 	u8 AmplifierType_2G;
 	u8 bEn_RFE;
 	u8 RFE_Type;

drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -1

index 02e01f0f0bf4..f4b2be4296c9 100644
@@ -263,7 +263,6 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 	registry_par->reg_enable_tx_power_by_rate = (u8)rtw_tx_pwr_by_rate;
 
 	registry_par->reg_power_base = 14;
-	registry_par->TxBBSwing_2G = 0xFF;
 	registry_par->bEn_RFE = 1;
 	registry_par->RFE_Type = 64;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #6 lore raw

PATCH v2 6/8 staging: rtl8723bs: remove unused variable AmplifierType_2G

In reply to Ethan Tidmore

The variable AmplifierType_2G is declared in struct registry_priv but is never initialized or used within the driver. Remove it to clean up the code and fix a CamelCase warning.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/include/drv_types.h | 1 -
 1 file changed, 1 deletion(-)

drivers/staging/rtl8723bs/include/drv_types.h +0 -1

index cbbdf45012c4..64a2ffd45563 100644
@@ -160,7 +160,6 @@ struct registry_priv {
 	u8 reg_enable_tx_power_by_rate;
 	u8 reg_power_base;
 	u8 reg_pwr_tbl_sel;
-	u8 AmplifierType_2G;
 	u8 bEn_RFE;
 	u8 RFE_Type;
 	u8  check_fw_ps;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #7 lore raw

PATCH v2 7/8 staging: rtl8723bs: remove unused variable bEn_RFE

In reply to Ethan Tidmore

The variable bEn_RFE is initialized but never read or used anywhere in the driver. Remove it to clean up dead code and fix a CamelCase warning.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/include/drv_types.h | 1 -
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   | 1 -
 2 files changed, 2 deletions(-)

drivers/staging/rtl8723bs/include/drv_types.h +0 -1

index 64a2ffd45563..00da21774c4d 100644
@@ -160,7 +160,6 @@ struct registry_priv {
 	u8 reg_enable_tx_power_by_rate;
 	u8 reg_power_base;
 	u8 reg_pwr_tbl_sel;
-	u8 bEn_RFE;
 	u8 RFE_Type;
 	u8  check_fw_ps;

drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -1

index f4b2be4296c9..c163e2eeea26 100644
@@ -263,7 +263,6 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 	registry_par->reg_enable_tx_power_by_rate = (u8)rtw_tx_pwr_by_rate;
 
 	registry_par->reg_power_base = 14;
-	registry_par->bEn_RFE = 1;
 	registry_par->RFE_Type = 64;
 
 	registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable;

Signature · 1 line

2.52.0

Ethan Tidmore

author

2026-01-27 01:21 UTC #8 lore raw

PATCH v2 8/8 staging: rtl8723bs: remove unused variable RFE_Type

In reply to Ethan Tidmore

The variable RFE_Type is initialized but never read or used anywhere in the driver. Remove it to clean up dead code and fix a CamelCase warning.

Signed-off-by Ethan Tidmore <[email protected]>

---
 drivers/staging/rtl8723bs/include/drv_types.h | 1 -
 drivers/staging/rtl8723bs/os_dep/os_intfs.c   | 1 -
 2 files changed, 2 deletions(-)

drivers/staging/rtl8723bs/include/drv_types.h +0 -1

index 00da21774c4d..11e1feade4e4 100644
@@ -160,7 +160,6 @@ struct registry_priv {
 	u8 reg_enable_tx_power_by_rate;
 	u8 reg_power_base;
 	u8 reg_pwr_tbl_sel;
-	u8 RFE_Type;
 	u8  check_fw_ps;
 
 	u8 qos_opt_enable;

drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -1

index c163e2eeea26..f7f23d1b1709 100644
@@ -263,7 +263,6 @@ static void loadparam(struct adapter *padapter, struct net_device *pnetdev)
 	registry_par->reg_enable_tx_power_by_rate = (u8)rtw_tx_pwr_by_rate;
 
 	registry_par->reg_power_base = 14;
-	registry_par->RFE_Type = 64;
 
 	registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable;

Signature · 1 line

2.52.0