From nobody Sat Feb 7 12:19:41 2026 Received: from mail-yx1-f41.google.com (mail-yx1-f41.google.com [74.125.224.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CF1533D6C7 for ; Mon, 26 Jan 2026 14:16:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769436963; cv=none; b=R8W3Pi9Rp67szvIi5JOW/hB1HicugHBpiRWGdlqajHcd6kGQMH9DQB6BUzAS4njyToJq2J2OuHk23JtI2+KMaGHL/+bqjNtBKk7WTP4qBYUesMITPeWRSm8ri9Z+mPDGj5GtZuFPXWdfPgSWVbTpjLPXwSPFnFMGEnaujkKdbqU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769436963; c=relaxed/simple; bh=GoEx4Uv75QdjPF0v6d9seZHEr9+BxBBVeRkHUUbqcvA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=a+AyeT9tJyq1k5ojth6P6zaZJxGeGe9nCdp4DnWWD1U+/iix71FQHplQX7lwb89I6enQEkNcsRGtDxGrhjZ+mjXMkZY+Sx5ysWQPDvt8nZeCi6LYUcBe8ZegSeCa1uabEu50eSwXTQIgbXaZNAoYp5GCfnNsLFNYPdtzU4IIbVM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZhgYO47Q; arc=none smtp.client-ip=74.125.224.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZhgYO47Q" Received: by mail-yx1-f41.google.com with SMTP id 956f58d0204a3-649523de905so5841855d50.1 for ; Mon, 26 Jan 2026 06:16:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769436959; x=1770041759; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=XBm6sEEZe9njCPVLqzz+tpfyw7ujSmaY9iyVVX+JmhQ=; b=ZhgYO47QNRe/Ke3lgWf+F7DI0iNZyZvFtxNzmDRvierF4gxKDvZepwQFyb0HJu8fGf SWx2ewbJIf9MpBt08MB5LgaOspxEe/N9BGwZn93wKJQQX9Kr59ITMizGPSplFmASYChe JN2AF5xO1ou//t4JT/N9IX4Tt9UuYs/lWPBMVf8VuqmPSxkwxok02Ab3Ge4o84Wk2YsZ AC8VeMUEh4o85MM0T35EyLpEHdAHxdOVn6MNGaRsjZdTPpj1atn+RAzaL4eNPBAi8LCw ddUCiDbPa7B8es0bjdzFALdPSW4Z/4s//GJADZh2ocOSdVZb77ZLevMwhz79rOt9lfcW 3Jiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769436959; x=1770041759; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XBm6sEEZe9njCPVLqzz+tpfyw7ujSmaY9iyVVX+JmhQ=; b=piqpZGKzF4IxGrpINsbSe213dTNdGNukiQHpsal3HN2YQYlpkXr9H1COzFiMdIt8z3 S8sB9VFxA2S/G8Q/hgcTFKoqT/9G9Vdw7FGK2zvJg2jF+rwLkQKzLOyLzqg8ioEDHKek Vj7lQal/vHuxBEMNJj+q16hWADwK0s0UCDApsyVM8Ji6pys4GYu2tCAaDV6i9f+AvkL+ 5o/G6I9qQn3ORKzMd8dW28tXJSBxiGI0nQAMIg9Ml5UtfaTLB5l2ldsSRh2cNSCGLn1/ wzx8fbYPmtqoFstYX1egR7pIlCqcgmkfd42hdlLyJYgnV/sGByh05cGVEdLv8O0u8sA1 WI5g== X-Forwarded-Encrypted: i=1; AJvYcCWq0cknVipEx/1ICzwzBbV/CbMF1bqL1TTuciwX0vYDLmhk7bmR0YFyoKjF3dk69DWHXR3wnQA2TxJWBT4=@vger.kernel.org X-Gm-Message-State: AOJu0YwNNhRHEr0GPhJD7X07Y6tFJF+XEQXyy0yADObfGczXi9U0qzvX 5uD4s0WoArFAwKX3U433+FT10D+aKo7GuRPTmupYYrZfMXuAvo+lrSql X-Gm-Gg: AZuq6aLtm/tQ4Bzr7PIVvRuu8Oaw15zWr5AJyhx+H0nCJqI1/A1h0CQfnBe0i9gYW4C eM0nZNunT5tQvGCR9MvGzTQ4nqaFfYT16zz2fw9hEILSnZA5ibrgPq0SFezhP5neS2YyqUwGPP2 jgcFNd3KQ8Cl8Yczef7tLooranSoXeD7ghBi54SBne5hS9CNntQmjxH7cXiwIVpXXQjX2TK8Hzj RRLFk+3OjMUJoP/vh6sZDCSQB+kX9dLWou1Qelek0YMBfEs0/ufgOkSCHoCEOwNO9fIlUbVxDs7 osKj1MvIoemvN14hCgQWbXbFxjjeuuLYf8+2f7kTol4GvSR5lfi1g1tzARBZCrY3/oZwF9N65j2 KFTpX3YYQFm/MtrXWm3xHMc0k2wgAOZf+VHd/pDdCEr54assaWdglh2pojiveGP/jUgE= X-Received: by 2002:a05:690e:4008:b0:649:6f4a:d8d4 with SMTP id 956f58d0204a3-649713668bcmr3110631d50.20.1769436958938; Mon, 26 Jan 2026 06:15:58 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::89f2]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-6495ce752f2sm5283655d50.1.2026.01.26.06.15.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jan 2026 06:15:58 -0800 (PST) From: Ethan Tidmore To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube , Hans de Goede , Akiyoshi Kurita , Dan Carpenter , Ethan Tidmore Subject: [PATCH v1] staging: rtl8723bs: rename members of struct registry_priv Date: Mon, 26 Jan 2026 08:15:43 -0600 Message-ID: <20260126141543.2527-1-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename CamelCase members of struct registry_priv to snake_case to comply with the Linux kernel coding style. As some of these renames result in longer variable names, use a local pointer in deeply nested functions to avoid exceeding the 100-column limit and fix block braces where necessary to maintain style consistency. Signed-off-by: Ethan Tidmore --- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 16 ++++++---- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 32 ++++++++----------- drivers/staging/rtl8723bs/include/drv_types.h | 18 +++++------ .../rtl8723bs/include/hal_com_phycfg.h | 2 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 +++---- 5 files changed, 39 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/stagi= ng/rtl8723bs/hal/hal_com_phycfg.c index cd76e26e8..450bd2e38 100644 --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c @@ -573,8 +573,9 @@ s8 PHY_GetTxPowerByRate(struct adapter *padapter, u8 RF= Path, u8 Rate) s8 value =3D 0; u8 rateIndex =3D PHY_GetRateIndexOfTxPowerByRate(Rate); =20 - if ((padapter->registrypriv.RegEnableTxPowerByRate =3D=3D 2 && pHalData->= EEPROMRegulatory =3D=3D 2) || - padapter->registrypriv.RegEnableTxPowerByRate =3D=3D 0) + if ((padapter->registrypriv.reg_enable_tx_power_by_rate =3D=3D 2 && + pHalData->EEPROMRegulatory =3D=3D 2) || + padapter->registrypriv.reg_enable_tx_power_by_rate =3D=3D 0) return 0; =20 if (RFPath >=3D RF_PATH_MAX) @@ -690,12 +691,12 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 re= g_pwr_tbl_sel, struct hal_com_data *hal_data =3D GET_HAL_DATA(adapter); s8 limits[10] =3D {0}; u8 i =3D 0; =20 - if (((adapter->registrypriv.RegEnableTxPowerLimit =3D=3D 2) && + if (((adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 2) && (hal_data->EEPROMRegulatory !=3D 1)) || - (adapter->registrypriv.RegEnableTxPowerLimit =3D=3D 0)) + (adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 0)) return MAX_POWER_INDEX; =20 - switch (adapter->registrypriv.RegPwrTblSel) { + switch (adapter->registrypriv.reg_pwr_tbl_sel) { case 1: idx_regulation =3D TXPWR_LMT_ETSI; break; @@ -750,7 +751,8 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_= pwr_tbl_sel, =20 void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter *Adapter) { - struct hal_com_data *pHalData =3D GET_HAL_DATA(Adapter); + struct hal_com_data *pHalData =3D GET_HAL_DATA(Adapter); + struct registry_priv *r =3D &Adapter->registrypriv; u8 BW40PwrBasedBm2_4G =3D 0x2E; u8 regulation, bw, channel, rateSection; s8 tempValue =3D 0, tempPwrLmt =3D 0; @@ -771,7 +773,7 @@ void PHY_ConvertTxPowerLimitToPowerIndex(struct adapter= *Adapter) else if (rateSection =3D=3D 0) /* CCK */ BW40PwrBasedBm2_4G =3D PHY_GetTxPowerByRateBase(Adapter, rfPath, C= CK); } else - BW40PwrBasedBm2_4G =3D Adapter->registrypriv.RegPowerBase * 2; + BW40PwrBasedBm2_4G =3D r->reg_power_base * 2; =20 if (tempPwrLmt !=3D MAX_POWER_INDEX) { tempValue =3D tempPwrLmt - BW40PwrBasedBm2_4G; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/stag= ing/rtl8723bs/hal/rtl8723b_phycfg.c index d8709d40c..897c3f98e 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c @@ -338,13 +338,11 @@ static int phy_BB8723b_Config_ParaFile(struct adapter= *Adapter) =20 /* Read Tx Power Limit File */ PHY_InitTxPowerLimit(Adapter); - if ( - Adapter->registrypriv.RegEnableTxPowerLimit =3D=3D 1 || - (Adapter->registrypriv.RegEnableTxPowerLimit =3D=3D 2 && pHalData->EEPRO= MRegulatory =3D=3D 1) - ) { - ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, - CONFIG_RF_TXPWR_LMT, 0); - } + + if (Adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 1 || + (Adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 2 && + pHalData->EEPROMRegulatory =3D=3D 1)) + ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_TXPWR_LMT, 0); =20 /* */ /* 1. Read PHY_REG.TXT BB INIT!! */ @@ -353,20 +351,18 @@ static int phy_BB8723b_Config_ParaFile(struct adapter= *Adapter) =20 /* If EEPROM or EFUSE autoload OK, We must config by PHY_REG_PG.txt */ PHY_InitTxPowerByRate(Adapter); - if ( - Adapter->registrypriv.RegEnableTxPowerByRate =3D=3D 1 || - (Adapter->registrypriv.RegEnableTxPowerByRate =3D=3D 2 && pHalData->EEPR= OMRegulatory !=3D 2) - ) { - ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, - CONFIG_BB_PHY_REG_PG); + + if (Adapter->registrypriv.reg_enable_tx_power_by_rate =3D=3D 1 || + (Adapter->registrypriv.reg_enable_tx_power_by_rate =3D=3D 2 && + pHalData->EEPROMRegulatory !=3D 2)) { + ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG); =20 if (pHalData->odmpriv.PhyRegPgValueType =3D=3D PHY_REG_PG_EXACT_VALUE) PHY_TxPowerByRateConfiguration(Adapter); =20 - if ( - Adapter->registrypriv.RegEnableTxPowerLimit =3D=3D 1 || - (Adapter->registrypriv.RegEnableTxPowerLimit =3D=3D 2 && pHalData->EEPR= OMRegulatory =3D=3D 1) - ) + if (Adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 1 || + (Adapter->registrypriv.reg_enable_tx_power_limit =3D=3D 2 && + pHalData->EEPROMRegulatory =3D=3D 1)) PHY_ConvertTxPowerLimitToPowerIndex(Adapter); } =20 @@ -541,7 +537,7 @@ u8 PHY_GetTxPowerIndex( =20 limit =3D phy_get_tx_pwr_lmt( padapter, - padapter->registrypriv.RegPwrTblSel, + padapter->registrypriv.reg_pwr_tbl_sel, pHalData->CurrentChannelBW, RFPath, Rate, diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/stagin= g/rtl8723bs/include/drv_types.h index f86180dc3..a63eb722c 100644 --- a/drivers/staging/rtl8723bs/include/drv_types.h +++ b/drivers/staging/rtl8723bs/include/drv_types.h @@ -156,15 +156,15 @@ struct registry_priv { u8 notch_filter; =20 /* define for tx power adjust */ - u8 RegEnableTxPowerLimit; - u8 RegEnableTxPowerByRate; - u8 RegPowerBase; - u8 RegPwrTblSel; - s8 TxBBSwing_2G; - u8 AmplifierType_2G; - u8 bEn_RFE; - u8 RFE_Type; - u8 check_fw_ps; + u8 reg_enable_tx_power_limit; + u8 reg_enable_tx_power_by_rate; + u8 reg_power_base; + u8 reg_pwr_tbl_sel; + s8 tx_bb_swing_2g; + u8 amplifier_type_2g; + u8 b_en_rfe; + u8 rfe_type; + u8 check_fw_ps; =20 u8 qos_opt_enable; =20 diff --git a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h b/drivers/s= taging/rtl8723bs/include/hal_com_phycfg.h index cb7c7ed74..deb5ec16f 100644 --- a/drivers/staging/rtl8723bs/include/hal_com_phycfg.h +++ b/drivers/staging/rtl8723bs/include/hal_com_phycfg.h @@ -90,7 +90,7 @@ void PHY_TxPowerByRateConfiguration(struct adapter *padap= ter); u8 PHY_GetTxPowerIndexBase(struct adapter *padapter, u8 RFPath, u8 Rate, enum channel_width BandWidth, u8 Channel); =20 -s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 RegPwrTblSel, +s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel, enum channel_width Bandwidth, u8 RfPath, u8 DataRate, u8 Channel); =20 diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index bc02db137..b67b4997f 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -259,13 +259,13 @@ static void loadparam(struct adapter *padapter, struc= t net_device *pnetdev) =20 registry_par->notch_filter =3D (u8)rtw_notch_filter; =20 - registry_par->RegEnableTxPowerLimit =3D (u8)rtw_tx_pwr_lmt_enable; - registry_par->RegEnableTxPowerByRate =3D (u8)rtw_tx_pwr_by_rate; + registry_par->reg_enable_tx_power_limit =3D (u8)rtw_tx_pwr_lmt_enable; + registry_par->reg_enable_tx_power_by_rate =3D (u8)rtw_tx_pwr_by_rate; =20 - registry_par->RegPowerBase =3D 14; - registry_par->TxBBSwing_2G =3D 0xFF; - registry_par->bEn_RFE =3D 1; - registry_par->RFE_Type =3D 64; + registry_par->reg_power_base =3D 14; + registry_par->tx_bb_swing_2g =3D 0xFF; + registry_par->b_en_rfe =3D 1; + registry_par->rfe_type =3D 64; =20 registry_par->qos_opt_enable =3D (u8)rtw_qos_opt_enable; =20 --=20 2.52.0