From: Ethan Tidmore Date: Tue, 27 Jan 2026 01:21:13 +0000 (-0600) Subject: staging: rtl8723bs: rename RegPowerBase to reg_power_base X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43e165f7e0238c8f0bbb6f17a56e12e0143224b6;p=thirdparty%2Fkernel%2Flinux.git staging: rtl8723bs: rename RegPowerBase to reg_power_base Rename RegPowerBase to reg_power_base to avoid CamelCase. Signed-off-by: Ethan Tidmore Link: https://patch.msgid.link/20260127012118.43037-4-ethantidmore06@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c index e7e355b41747..1a9a4bb15bd8 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -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; diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h index 847f29c7f3be..e1efc14e86af 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -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; diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c index 1558045f9366..02e01f0f0bf4 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -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;