From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 677EEC3DA79 for ; Thu, 29 Dec 2022 16:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233759AbiL2Q0M (ORCPT ); Thu, 29 Dec 2022 11:26:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233335AbiL2QZo (ORCPT ); Thu, 29 Dec 2022 11:25:44 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E29DBB for ; Thu, 29 Dec 2022 08:25:42 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id u28so22456929edd.10 for ; Thu, 29 Dec 2022 08:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=t8N//8jqLWrIkBGyfF8wv4Tl2KGsW1laCrcUj0eqwXw=; b=SOjIqDPJjAG3X8J2l0O1eskK3G1j4SzA1AkgO3M8IcMOGAfztcEIN0KSRvfW5nTL1c QBqK6wQBjo+GxJGcwUPfSufBmYCEG3TLjOMiDGPiiuVXw0rvqyLeALougT+LBzP5wIxj FKIF5Zf3HX4K9c4oDeZV6RpaA8xspwXNhozk6x1PgN16C+nxgRIHqjGNUSzAHBcn9eaz 9w/cO6YzILmXE6rmSLYAZSe3PEvroAtnMweberW0+j9NEJ1iiJ8e5tvf58Pl9/Xco093 b2cywR8IKDTatE3ZgHYEZcH6wBbtedaqn0qeZr/RqvE9g7wzJ178dmD3oLadYRT6tBfC AVCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=t8N//8jqLWrIkBGyfF8wv4Tl2KGsW1laCrcUj0eqwXw=; b=WEYuxA7I2PkLcWt6MO8iGV3KGISGCgKt6u3tILzgRJFojN3WmJuPa+bgRACGntppdp gNONBW1nQRi2ZN+WFDldAcN28c+k5ECIUFcVTUkJI8bzrl9wp9Z0wpX0JSyFgs9Qs2YX KOlayZXh6rm2p1gWofuLEx4aa8abMbi9bR/M54ewzLMA9N4ar5i9BDwE68H+uSPu1TF6 HQjUSLspn7dICt8afXVX1aVkogtc43+X4U9c7QGubVFAEIePYkjHd4xXPrLjKXwxWUyK 6vbdrUtTZQsfrB5qwpfxx6T5rLh1pGqwSAvYXKyT3DYRgOIU9rjdwJSQoB7+qm1CHnKH O2Ow== X-Gm-Message-State: AFqh2kqqY89IANcKg97Udbs6fpQfii2wsFsM/YhS3hv/peHusj5HWTMY 26S1OJxVogm7fQPDtiKxJp6jUWZvJ7Q= X-Google-Smtp-Source: AMrXdXtAgAaBcAczHzVDiavvwBqKWtBJ7XKXpu6mOv6PHDKBjjo6OQGw73CzqRIFzxE01OfbMiFeVg== X-Received: by 2002:aa7:dd13:0:b0:479:8313:2fe6 with SMTP id i19-20020aa7dd13000000b0047983132fe6mr4986436edv.1.1672331140891; Thu, 29 Dec 2022 08:25:40 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id bm25-20020a0564020b1900b0045cf4f72b04sm8420941edb.94.2022.12.29.08.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:25:40 -0800 (PST) Date: Thu, 29 Dec 2022 17:25:38 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] staging: rtl8192e: Rename ChannelPlan, eeprom_ChannelPlan and CckPwEnl Message-ID: <1b705718afdcf56475c10db4b284d2c91a58b250.1672330343.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable ChannelPlan to chnl_plan, eeprom_ChannelPlan to eeprom_chnl_plan and CckPwEnl to cck_pwr_enl to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../rtl8192e/rtl8192e/r8190P_rtl8256.c | 2 +- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/s= taging/rtl8192e/rtl8192e/r8190P_rtl8256.c index ab2e9b729883..93928f3585c1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -154,7 +154,7 @@ void rtl92e_set_cck_tx_power(struct net_device *dev, u8= powerlevel) if (priv->CustomerID =3D=3D RT_CID_819x_Netcore) TxAGC =3D 0x22; else - TxAGC +=3D priv->CckPwEnl; + TxAGC +=3D priv->cck_pwr_enl; } if (TxAGC > 0x24) TxAGC =3D 0x24; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index f02e67f68e23..25fa7714df4e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -306,7 +306,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->eeprom_CustomerID =3D usValue & 0xff; usValue =3D rtl92e_eeprom_read(dev, EEPROM_ICVersion_ChannelPlan>>1); - priv->eeprom_ChannelPlan =3D usValue&0xff; + priv->eeprom_chnl_plan =3D usValue&0xff; IC_Version =3D (usValue & 0xff00)>>8; =20 ICVer8192 =3D IC_Version & 0xf; @@ -328,7 +328,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->eeprom_vid =3D 0; priv->eeprom_did =3D 0; priv->eeprom_CustomerID =3D 0; - priv->eeprom_ChannelPlan =3D 0; + priv->eeprom_chnl_plan =3D 0; } =20 if (!priv->AutoloadFailFlag) { @@ -473,9 +473,9 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->rf_chip =3D RF_8256; =20 if (priv->reg_chnl_plan =3D=3D 0xf) - priv->ChannelPlan =3D priv->eeprom_ChannelPlan; + priv->chnl_plan =3D priv->eeprom_chnl_plan; else - priv->ChannelPlan =3D priv->reg_chnl_plan; + priv->chnl_plan =3D priv->reg_chnl_plan; =20 if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->CustomerID =3D RT_CID_DLINK; @@ -495,10 +495,10 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) break; case EEPROM_CID_TOSHIBA: priv->CustomerID =3D RT_CID_TOSHIBA; - if (priv->eeprom_ChannelPlan&0x80) - priv->ChannelPlan =3D priv->eeprom_ChannelPlan&0x7f; + if (priv->eeprom_chnl_plan & 0x80) + priv->chnl_plan =3D priv->eeprom_chnl_plan & 0x7f; else - priv->ChannelPlan =3D 0x0; + priv->chnl_plan =3D 0x0; break; case EEPROM_CID_Nettronix: priv->CustomerID =3D RT_CID_Nettronix; @@ -516,9 +516,9 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) break; } =20 - if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1) - priv->ChannelPlan =3D 0; - priv->ChannelPlan =3D COUNTRY_CODE_WORLD_WIDE_13; + if (priv->chnl_plan > CHANNEL_PLAN_LEN - 1) + priv->chnl_plan =3D 0; + priv->chnl_plan =3D COUNTRY_CODE_WORLD_WIDE_13; =20 if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->rtllib->bSupportRemoteWakeUp =3D true; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index f8fbe78ccad9..92260d098eaa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -862,7 +862,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->cck_present_attn =3D 0; priv->rfa_txpowertrackingindex =3D 0; priv->rfc_txpowertrackingindex =3D 0; - priv->CckPwEnl =3D 6; + priv->cck_pwr_enl =3D 6; priv->rst_progress =3D RESET_TYPE_NORESET; priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); @@ -952,13 +952,13 @@ static short _rtl92e_get_channel_map(struct net_devic= e *dev) return -1; } =20 - if (priv->ChannelPlan >=3D COUNTRY_CODE_MAX) { + if (priv->chnl_plan >=3D COUNTRY_CODE_MAX) { netdev_info(dev, "rtl819x_init:Error channel plan! Set to default.\n"); - priv->ChannelPlan =3D COUNTRY_CODE_FCC; + priv->chnl_plan =3D COUNTRY_CODE_FCC; } dot11d_init(priv->rtllib); - dot11d_channel_map(priv->ChannelPlan, priv->rtllib); + dot11d_channel_map(priv->chnl_plan, priv->rtllib); for (i =3D 1; i <=3D 11; i++) (priv->rtllib->active_channel_map)[i] =3D 1; (priv->rtllib->active_channel_map)[12] =3D 2; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index cceb77492363..93b3b75a063f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -420,7 +420,7 @@ struct r8192_priv { u16 eeprom_vid; u16 eeprom_did; u8 eeprom_CustomerID; - u16 eeprom_ChannelPlan; + u16 eeprom_chnl_plan; =20 u8 EEPROMTxPowerLevelCCK[14]; u8 EEPROMTxPowerLevelOFDM24G[14]; @@ -451,7 +451,7 @@ struct r8192_priv { bool bTXPowerDataReadFromEEPORM; =20 u16 reg_chnl_plan; - u16 ChannelPlan; + u16 chnl_plan; u8 hw_rf_off_action; =20 bool rf_change_in_progress; @@ -460,7 +460,7 @@ struct r8192_priv { =20 u8 DM_Type; =20 - u8 CckPwEnl; + u8 cck_pwr_enl; u16 TSSI_13dBm; u32 Pwr_Track; u8 CCKPresentAttentuation_20Mdefault; --=20 2.39.0 From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79640C4167B for ; Thu, 29 Dec 2022 16:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233796AbiL2Q0P (ORCPT ); Thu, 29 Dec 2022 11:26:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233513AbiL2QZv (ORCPT ); Thu, 29 Dec 2022 11:25:51 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 115E613D1E for ; Thu, 29 Dec 2022 08:25:50 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id qk9so46091121ejc.3 for ; Thu, 29 Dec 2022 08:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=x8lP7ydRMGUwV1Ross2Ed1IrnFNvMI3LfJx3zEWET/c=; b=KOIOJzXi2fSTKQghBJfAclApEuXEO+z4J4tHUBPVGzBh6ud+pdt3NdQlc+Zpayvf6Q 9KD2EX483x7jkwmd3Lk9S1FaRoA1vj88cQTzB+fe92DlCzTC6afcQ5B2ovauXhCZoeG9 orYUuZQmx+pl+IYJifRB92W6mwFjLQ48reM2t8tmOswxkjhdDpdY5MRWRRUzmqI4LrGQ jv5T5QdO4b3l4DuM+NdQ8DFfOu2h01+QYjUyH7z1E6O7anaQTKxMGc3skXj1REcLvyXc /5tTXzeKal7fgKauTvz8uwSndgZkIqgsg1YgTr8T7MCs85r32Hvkic+OoD5S2zLmnqtO 3CSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=x8lP7ydRMGUwV1Ross2Ed1IrnFNvMI3LfJx3zEWET/c=; b=dPTdyLVHjdiAWLIN+OSPSV55+MAna1SKeijDXLvyufHfn5rIj0+4ZUZVt+v1nZw6rE Q9tMvGInTPzut8puRqRt2GXIjDF4P9O1z814yj1GUUd4GHqyhiSoubup/JVBvnq20483 /3opJMmqYPJ1TaPT6EjGgX/14bRl4omLNPuWlFqM51+HT3GOnqE+Wkag0pIhgbD7OZVx ZIKeQotq5ZBXky2zuI5U9rBEC9oXDkYviJAveIBkd/+wCKhqrVO/WWOdWZFR2QzEhHQK iWw7Fk4XqKWTRNV6wksn2Ns/BjnKJ5foK009HgvuSD/TvF/iSXvr4Obzy+/o4ot5ht54 j7hw== X-Gm-Message-State: AFqh2kpqzmObAi0OfEBxER4dsMxuubrvv7C9YzZLzsywJWmnwrMv5Kz+ 7q+mCJFMiqYDcvNMkjziVoc= X-Google-Smtp-Source: AMrXdXsQwwb9S5E5bOXG/JdCW2hO/vy4aFkWCxwXA72qIMlXj+gIw6VIan8y6zp1ob1yKtgoMpabig== X-Received: by 2002:a17:906:280d:b0:837:c290:eb83 with SMTP id r13-20020a170906280d00b00837c290eb83mr6179075ejc.2.1672331148659; Thu, 29 Dec 2022 08:25:48 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id d20-20020a170906305400b0084c9036a526sm867719ejd.20.2022.12.29.08.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:25:48 -0800 (PST) Date: Thu, 29 Dec 2022 17:25:46 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/7] staging: rtl8192e: Rename TSSI_13dBm, Pwr_Track and NumTotalRFPath Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable TSSI_13dBm to tssi_13dbm, Pwr_Track to pwr_track and NumTotalRFPath to num_total_rf_path to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/s= taging/rtl8192e/rtl8192e/r8190P_rtl8256.c index 93928f3585c1..7517ec001421 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -21,7 +21,7 @@ void rtl92e_set_bandwidth(struct net_device *dev, return; } =20 - for (eRFPath =3D 0; eRFPath < priv->NumTotalRFPath; eRFPath++) { + for (eRFPath =3D 0; eRFPath < priv->num_total_rf_path; eRFPath++) { if (!rtl92e_is_legal_rf_path(dev, eRFPath)) continue; =20 @@ -63,10 +63,10 @@ bool rtl92e_config_rf(struct net_device *dev) u8 ConstRetryTimes =3D 5, RetryTimes =3D 5; u8 ret =3D 0; =20 - priv->NumTotalRFPath =3D RTL819X_TOTAL_RF_PATH; + priv->num_total_rf_path =3D RTL819X_TOTAL_RF_PATH; =20 for (eRFPath =3D (enum rf90_radio_path)RF90_PATH_A; - eRFPath < priv->NumTotalRFPath; eRFPath++) { + eRFPath < priv->num_total_rf_path; eRFPath++) { if (!rtl92e_is_legal_rf_path(dev, eRFPath)) continue; =20 @@ -195,7 +195,7 @@ void rtl92e_set_ofdm_tx_power(struct net_device *dev, u= 8 powerlevel) if (index =3D=3D 3) { writeVal_tmp =3D (byte3 << 24) | (byte2 << 16) | (byte1 << 8) | byte0; - priv->Pwr_Track =3D writeVal_tmp; + priv->pwr_track =3D writeVal_tmp; } =20 if (priv->bDynamicTxHighPower) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 25fa7714df4e..c94c67643efb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -371,7 +371,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) 0xff00) >> 8; else priv->EEPROMThermalMeter =3D EEPROM_Default_ThermalMeter; - priv->TSSI_13dBm =3D priv->EEPROMThermalMeter * 100; + priv->tssi_13dbm =3D priv->EEPROMThermalMeter * 100; =20 if (priv->epromtype =3D=3D EEPROM_93C46) { if (!priv->AutoloadFailFlag) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index a813eded4cb3..ccbce3e177b6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -904,7 +904,7 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_de= vice *dev, u8 channel, break; case CmdID_RF_WriteReg: for (eRFPath =3D 0; eRFPath < - priv->NumTotalRFPath; eRFPath++) + priv->num_total_rf_path; eRFPath++) rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath, CurrentCmd->Para1, bMask12Bits, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 93b3b75a063f..0e02add8b6be 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -445,7 +445,7 @@ struct r8192_priv { u8 nCur40MhzPrimeSC; =20 u32 RfReg0Value[4]; - u8 NumTotalRFPath; + u8 num_total_rf_path; bool brfpath_rxenable[4]; =20 bool bTXPowerDataReadFromEEPORM; @@ -461,8 +461,8 @@ struct r8192_priv { u8 DM_Type; =20 u8 cck_pwr_enl; - u16 TSSI_13dBm; - u32 Pwr_Track; + u16 tssi_13dbm; + u32 pwr_track; u8 CCKPresentAttentuation_20Mdefault; u8 CCKPresentAttentuation_40Mdefault; s8 CCKPresentAttentuation_difference; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index a18393c8a833..c27d9fb7a7e6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -615,14 +615,14 @@ static void _rtl92e_dm_tx_power_tracking_callback_tss= i(struct net_device *dev) u8 RF_Type, tmp_report[5] =3D {0, 0, 0, 0, 0}; u32 Value; u8 Pwr_Flag; - u16 Avg_TSSI_Meas, TSSI_13dBm, Avg_TSSI_Meas_from_driver =3D 0; + u16 Avg_TSSI_Meas, tssi_13dbm, Avg_TSSI_Meas_from_driver =3D 0; u32 delta =3D 0; =20 rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); priv->rtllib->bdynamic_txpower_enable =3D false; =20 - powerlevelOFDM24G =3D priv->Pwr_Track >> 24; + powerlevelOFDM24G =3D priv->pwr_track >> 24; RF_Type =3D priv->rf_type; Value =3D (RF_Type<<8) | powerlevelOFDM24G; =20 @@ -688,12 +688,12 @@ static void _rtl92e_dm_tx_power_tracking_callback_tss= i(struct net_device *dev) Avg_TSSI_Meas_from_driver +=3D tmp_report[k]; =20 Avg_TSSI_Meas_from_driver *=3D 100 / 5; - TSSI_13dBm =3D priv->TSSI_13dBm; + tssi_13dbm =3D priv->tssi_13dbm; =20 - if (Avg_TSSI_Meas_from_driver > TSSI_13dBm) - delta =3D Avg_TSSI_Meas_from_driver - TSSI_13dBm; + if (Avg_TSSI_Meas_from_driver > tssi_13dbm) + delta =3D Avg_TSSI_Meas_from_driver - tssi_13dbm; else - delta =3D TSSI_13dBm - Avg_TSSI_Meas_from_driver; + delta =3D tssi_13dbm - Avg_TSSI_Meas_from_driver; =20 if (delta <=3D E_FOR_TX_POWER_TRACK) { priv->rtllib->bdynamic_txpower_enable =3D true; @@ -701,7 +701,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(= struct net_device *dev) rtl92e_writeb(dev, FW_Busy_Flag, 0); return; } - if (Avg_TSSI_Meas_from_driver < TSSI_13dBm - E_FOR_TX_POWER_TRACK) + if (Avg_TSSI_Meas_from_driver < tssi_13dbm - E_FOR_TX_POWER_TRACK) _rtl92e_dm_tx_update_tssi_weak_signal(dev, RF_Type); else --=20 2.39.0 From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AF4BC4708E for ; Thu, 29 Dec 2022 16:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233811AbiL2Q0V (ORCPT ); Thu, 29 Dec 2022 11:26:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233599AbiL2Q0A (ORCPT ); Thu, 29 Dec 2022 11:26:00 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 473A8C760 for ; Thu, 29 Dec 2022 08:25:59 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id s5so27290622edc.12 for ; Thu, 29 Dec 2022 08:25:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Ww/uAqFdAcwRcQeR8Rg6QiNEw//qbeEW+MDr/TQ3wnA=; b=bvPwjDEtB8E2c4O2ooRhlmbl8wUsfTz0op26AoZzjrZMCvgJYeSSEYCU808USKIXyH Onmuxo+7e2k7ks2OIcn5LcBA9UPuQswvAS4leGSmYI1k8n76uFGykfHJOLWs5o+Aqf7o ScPrbonWZgoqAMBv+b6u3Ii8sCG7h5Br1SZUPNj3O2nB5I7RegTeY6Oy0scVsdMeaPkV Q53UDMiT/YDCIUqq38VvkgqK4NXooIqeKtsjXeDFKDV6+gmrob6xXZD1k+1/D6iwKHlq NZ19Yk7AOjermqL3lphSdwh19YGm4y8LlBliel6dHBBe2WOOlHu8ummExElA0i9dk9PX ZNqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Ww/uAqFdAcwRcQeR8Rg6QiNEw//qbeEW+MDr/TQ3wnA=; b=jC+zFXaN4ke78PmHNyRciePrrIHUVUkhgTEa1ukNEOUSA5J7mMdARnGpTYr7eSAVY2 G9l0vkz5W263XGHHuUTXFe6yhQnUdRon9vsMSlBiPKggEOfHM0bu9GcPtFg9quJrx4qo 4znxOKZ2ctItAksKh6dMRL0TzljxAn2JTLe7z92vsdm1DdJk6A2aRNbFzz4GGpF/ecfq YJWXl8oy04gITlamWzcKapYknUOBw71dr42k3qy1n6l+VhVfVzGQD97hA+bXfgtaxmJW MkXhwQ7/6RbKA3q6lyydbUJd5hr5gwtoAg7T+bfPWCBN/iRDS8ExziqwoaCMeGW/K8Ed Kt7A== X-Gm-Message-State: AFqh2kqCF1WOcL1AJtS8krDKSzb3NLog7s4tJ6praOAI4fBTkarHSDAj F2F4gszt1L1ZMsXwLyW5CtQ= X-Google-Smtp-Source: AMrXdXuHMZQHmYbCrMpYPS9ae/Uky9B57qU+3AN2c78nCrAt/JDn4p/0pC2pHzcAzKyZpydn69rehw== X-Received: by 2002:a05:6402:541a:b0:46c:e974:fa49 with SMTP id ev26-20020a056402541a00b0046ce974fa49mr5333856edb.4.1672331157876; Thu, 29 Dec 2022 08:25:57 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id ek20-20020a056402371400b004835bd8dfe5sm6455611edb.35.2022.12.29.08.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:25:57 -0800 (PST) Date: Thu, 29 Dec 2022 17:25:55 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] staging: rtl8192e: Rename CCKPresentAtt... Message-ID: <194e83dd0aa5d2619ba472b35e9add81aa0c82a0.1672330343.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable CCKPresentAttentuation_20Mdefault to cck_present_attn_20m_def, CCKPresentAttentuation_40Mdefault to cck_present_attn_40m_def and CCKPresentAttentuation_difference to cck_present_attn_diff to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 16 ++++++++-------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index c94c67643efb..e3b534206f20 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -787,14 +787,14 @@ bool rtl92e_start_adapter(struct net_device *dev) =20 for (i =3D 0; i < CCKTxBBGainTableLength; i++) { if (TempCCk =3D=3D dm_cck_tx_bb_gain[i][0]) { - priv->CCKPresentAttentuation_20Mdefault =3D i; + priv->cck_present_attn_20m_def =3D i; break; } } - priv->CCKPresentAttentuation_40Mdefault =3D 0; - priv->CCKPresentAttentuation_difference =3D 0; + priv->cck_present_attn_40m_def =3D 0; + priv->cck_present_attn_diff =3D 0; priv->cck_present_attn =3D - priv->CCKPresentAttentuation_20Mdefault; + priv->cck_present_attn_20m_def; priv->btxpower_tracking =3D false; } } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index ccbce3e177b6..33b39b1dc655 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1009,8 +1009,8 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi= (struct net_device *dev) switch (priv->CurrentChannelBW) { case HT_CHANNEL_WIDTH_20: priv->cck_present_attn =3D - priv->CCKPresentAttentuation_20Mdefault + - priv->CCKPresentAttentuation_difference; + priv->cck_present_attn_20m_def + + priv->cck_present_attn_diff; =20 if (priv->cck_present_attn > (CCKTxBBGainTableLength-1)) @@ -1034,8 +1034,8 @@ static void _rtl92e_cck_tx_power_track_bw_switch_tssi= (struct net_device *dev) =20 case HT_CHANNEL_WIDTH_20_40: priv->cck_present_attn =3D - priv->CCKPresentAttentuation_40Mdefault + - priv->CCKPresentAttentuation_difference; + priv->cck_present_attn_40m_def + + priv->cck_present_attn_diff; =20 if (priv->cck_present_attn > (CCKTxBBGainTableLength - 1)) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 0e02add8b6be..1c5a2a622ccb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -463,9 +463,9 @@ struct r8192_priv { u8 cck_pwr_enl; u16 tssi_13dbm; u32 pwr_track; - u8 CCKPresentAttentuation_20Mdefault; - u8 CCKPresentAttentuation_40Mdefault; - s8 CCKPresentAttentuation_difference; + u8 cck_present_attn_20m_def; + u8 cck_present_attn_40m_def; + s8 cck_present_attn_diff; s8 cck_present_attn; long undecorated_smoothed_pwdb; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index c27d9fb7a7e6..272c5472367e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -708,21 +708,21 @@ static void _rtl92e_dm_tx_power_tracking_callback_tss= i(struct net_device *dev) _rtl92e_dm_tx_update_tssi_strong_signal(dev, RF_Type); =20 if (RF_Type =3D=3D RF_2T4R) { - priv->CCKPresentAttentuation_difference + priv->cck_present_attn_diff =3D priv->rfa_txpowertrackingindex - priv->rfa_txpowertracking_defaul= t; } else { - priv->CCKPresentAttentuation_difference + priv->cck_present_attn_diff =3D priv->rfa_txpowertrackingindex_real - priv->rfa_txpowertracking_d= efault; } =20 if (priv->CurrentChannelBW =3D=3D HT_CHANNEL_WIDTH_20) priv->cck_present_attn =3D - priv->CCKPresentAttentuation_20Mdefault + - priv->CCKPresentAttentuation_difference; + priv->cck_present_attn_20m_def + + priv->cck_present_attn_diff; else priv->cck_present_attn =3D - priv->CCKPresentAttentuation_40Mdefault + - priv->CCKPresentAttentuation_difference; + priv->cck_present_attn_40m_def + + priv->cck_present_attn_diff; =20 if (priv->cck_present_attn > (CCKTxBBGainTableLength-1)) priv->cck_present_attn =3D CCKTxBBGainTableLength-1; @@ -742,8 +742,8 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(= struct net_device *dev) rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); } =20 - if (priv->CCKPresentAttentuation_difference <=3D -12 || - priv->CCKPresentAttentuation_difference >=3D 24) { + if (priv->cck_present_attn_diff <=3D -12 || + priv->cck_present_attn_diff >=3D 24) { priv->rtllib->bdynamic_txpower_enable =3D true; rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); --=20 2.39.0 From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E2BEC4332F for ; Thu, 29 Dec 2022 16:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233386AbiL2Q0k (ORCPT ); Thu, 29 Dec 2022 11:26:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233621AbiL2Q0H (ORCPT ); Thu, 29 Dec 2022 11:26:07 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 836D113DD4 for ; Thu, 29 Dec 2022 08:26:06 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id u19so46038087ejm.8 for ; Thu, 29 Dec 2022 08:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=aR9c5zdfo3vmAkmJ8xuc6Xs69P9xog38I7XyGG+1TNc=; b=ZSKH16BZi0K/9yVqDeBbjV/NIEweVjJGEcdBXAMyZlVvXvevNFsFFSyNPfmkfTzIes N6DMfP20qEVgs/NopLc3MfvbECKr2HAfPsl8VaY/c1W8WTSCUoMjyJeeyMehMlrMq8DE gfzc9iQ7up+o/53+VO9CLgggD7ujud0XYmraKEdxVHNu7lNDcUHJgkVK5OCIBvrkI6B8 60/32h2peFy8XRzRPyv891bPn6hH0tvF0OQ3l/tQYNUH0Wv1EKo1yRiE51agvNXIo257 bPaDuc6ax0RLm/iyVey+6HWjeYxPs9KDR3y+KYrs58I9TtIvNoBIeyMUiMPpIuTfQ8Y8 DbDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aR9c5zdfo3vmAkmJ8xuc6Xs69P9xog38I7XyGG+1TNc=; b=xyw59j+IMb2TOQ2AXI5p04tiEjfGxNNsnI+n/NrAXQnNSNWqTMtUX7kYNIkT5HhJ7O VBywRRlaQ+0rUtSF9HYAy3+ut7Yjpl2wmQOzZpPorTv1BTvEXSYOlzY6arA8WUpO35AQ rmAw2Kd8Q5BJ7+VqNADAD0ibkVd3r7LlYVo3OPRf8/LTzLtcQlsBXP00CQ0WFgr70aHu JJWTShBupWpiyJPtKVIaPxEnKnmVJj+d643UQoZJr/09ptCVfKWdIluk7lLEnzOfabni aRxt1W8HNhty1HsYdfxYBX1xZycKg+xM9Es8aRsvJsv3mof2UTe3urC/T2+fsSG1E2u5 uaWA== X-Gm-Message-State: AFqh2krcbspkuA61c9ClQPD2tFb91Q5W2+Yh3e6CAJ3hNca3330qPN69 uWCg/Z6nnivjrqAgLSahYIVtgYGA0yc= X-Google-Smtp-Source: AMrXdXvo0SwL8Gm4Zip4asr7a7quP1W93S4txdaItL0+e0prpHvw6K8pu2LFMSfNgReop4F/0ogpBw== X-Received: by 2002:a17:907:a0d1:b0:7c1:41bb:70b3 with SMTP id hw17-20020a170907a0d100b007c141bb70b3mr5887943ejc.0.1672331165020; Thu, 29 Dec 2022 08:26:05 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id t7-20020a1709066bc700b0081bfc79beaesm8633609ejs.75.2022.12.29.08.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:26:04 -0800 (PST) Date: Thu, 29 Dec 2022 17:26:02 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/7] staging: rtl8192e: Rename TxPowerLevelCCK... Message-ID: <659aeef65d9ce390106727f720a7b2104d41f37b.1672330343.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable TxPowerLevelCCK to tx_pwr_level_cck, TxPowerLevelCCK_A to tx_pwr_level_cck_a and TxPowerLevelCCK_C to tx_pwr_level_cck_c to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e3b534206f20..c121784bd810 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -408,7 +408,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) } if (priv->epromtype =3D=3D EEPROM_93C46) { for (i =3D 0; i < 14; i++) { - priv->TxPowerLevelCCK[i] =3D + priv->tx_pwr_level_cck[i] =3D priv->EEPROMTxPowerLevelCCK[i]; priv->TxPowerLevelOFDM24G[i] =3D priv->EEPROMTxPowerLevelOFDM24G[i]; @@ -427,31 +427,31 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) } else if (priv->epromtype =3D=3D EEPROM_93C56) { =20 for (i =3D 0; i < 3; i++) { - priv->TxPowerLevelCCK_A[i] =3D + priv->tx_pwr_level_cck_a[i] =3D priv->EEPROMRfACCKChnl1TxPwLevel[0]; priv->TxPowerLevelOFDM24G_A[i] =3D priv->EEPROMRfAOfdmChnlTxPwLevel[0]; - priv->TxPowerLevelCCK_C[i] =3D + priv->tx_pwr_level_cck_c[i] =3D priv->EEPROMRfCCCKChnl1TxPwLevel[0]; priv->TxPowerLevelOFDM24G_C[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[0]; } for (i =3D 3; i < 9; i++) { - priv->TxPowerLevelCCK_A[i] =3D + priv->tx_pwr_level_cck_a[i] =3D priv->EEPROMRfACCKChnl1TxPwLevel[1]; priv->TxPowerLevelOFDM24G_A[i] =3D priv->EEPROMRfAOfdmChnlTxPwLevel[1]; - priv->TxPowerLevelCCK_C[i] =3D + priv->tx_pwr_level_cck_c[i] =3D priv->EEPROMRfCCCKChnl1TxPwLevel[1]; priv->TxPowerLevelOFDM24G_C[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[1]; } for (i =3D 9; i < 14; i++) { - priv->TxPowerLevelCCK_A[i] =3D + priv->tx_pwr_level_cck_a[i] =3D priv->EEPROMRfACCKChnl1TxPwLevel[2]; priv->TxPowerLevelOFDM24G_A[i] =3D priv->EEPROMRfAOfdmChnlTxPwLevel[2]; - priv->TxPowerLevelCCK_C[i] =3D + priv->tx_pwr_level_cck_c[i] =3D priv->EEPROMRfCCCKChnl1TxPwLevel[2]; priv->TxPowerLevelOFDM24G_C[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[2]; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 33b39b1dc655..ee6138699e10 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -592,14 +592,14 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 c= hannel) u32 u4RegValue; =20 if (priv->epromtype =3D=3D EEPROM_93C46) { - powerlevel =3D priv->TxPowerLevelCCK[channel-1]; + powerlevel =3D priv->tx_pwr_level_cck[channel - 1]; powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G[channel-1]; } else if (priv->epromtype =3D=3D EEPROM_93C56) { if (priv->rf_type =3D=3D RF_1T2R) { - powerlevel =3D priv->TxPowerLevelCCK_C[channel-1]; + powerlevel =3D priv->tx_pwr_level_cck_c[channel - 1]; powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G_C[channel-1]; } else if (priv->rf_type =3D=3D RF_2T4R) { - powerlevel =3D priv->TxPowerLevelCCK_A[channel-1]; + powerlevel =3D priv->tx_pwr_level_cck_a[channel - 1]; powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G_A[channel-1]; =20 ant_pwr_diff =3D priv->TxPowerLevelOFDM24G_C[channel-1] @@ -726,7 +726,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum r= f90_radio_path eRFPath) static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel) { struct r8192_priv *priv =3D rtllib_priv(dev); - u8 powerlevel =3D priv->TxPowerLevelCCK[channel-1]; + u8 powerlevel =3D priv->tx_pwr_level_cck[channel - 1]; u8 powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G[channel-1]; =20 switch (priv->rf_chip) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 1c5a2a622ccb..a74ef0125caa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -470,9 +470,9 @@ struct r8192_priv { long undecorated_smoothed_pwdb; =20 u32 MCSTxPowerLevelOriginalOffset[6]; - u8 TxPowerLevelCCK[14]; - u8 TxPowerLevelCCK_A[14]; - u8 TxPowerLevelCCK_C[14]; + u8 tx_pwr_level_cck[14]; + u8 tx_pwr_level_cck_a[14]; + u8 tx_pwr_level_cck_c[14]; u8 TxPowerLevelOFDM24G[14]; u8 TxPowerLevelOFDM24G_A[14]; u8 TxPowerLevelOFDM24G_C[14]; --=20 2.39.0 From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60C44C4167B for ; Thu, 29 Dec 2022 16:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233717AbiL2Q0m (ORCPT ); Thu, 29 Dec 2022 11:26:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233833AbiL2Q0Y (ORCPT ); Thu, 29 Dec 2022 11:26:24 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45E70140B6 for ; Thu, 29 Dec 2022 08:26:19 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id bj12so46021533ejb.13 for ; Thu, 29 Dec 2022 08:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=eS98uo5EwthbiK4UNGthUBCm8vqMR7EmoQLq88cB8yc=; b=dQNrll5LjUVKXeTAho50UrGzlMkAGXpx4NjnpY6AaKpnQIyz3rtL8OVByzbHCQhTk6 h6TlQV11WRRlUmvAtfydRD5ukKB1oWHouuxWkHxckeKk+ZbM6y8130Zmimc68tpweyG7 z5+0oA6wsu6lYRMCX3O1zH2Lb0eoIfRSnfFbb8Tzviwxx7/jmX39Ypb38bEId/IPPKEO uPOxp2jK1VNUG1ePHj2y0V164ka1FFAyR2CHvjKfHHXhLo35WgNq8wGoR7BWvpvtBWLl ix4OXyYNv+GptY6Zh62yLG/37BJudOdSLpEWZejAi4w/62haczuCDQSaVw7mlWFURM3c pF/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eS98uo5EwthbiK4UNGthUBCm8vqMR7EmoQLq88cB8yc=; b=Rcsjj2BmE/EfY2xcoX4caoQ5rEAlxrEQ36I/5GIkam15vfJssl6sBuz9fN1dywC/aD LboSwnQYNrbxhY4yFXF9tKCkBlVmwCet5kMSZfWEpzNp+C66x1RLku3F1X4Fw9zTHY/D yWFmA9qWgENOeNmIrFXT8+IA5duE6fGs4Mpb+gmtLUtyrBDwiBzs9o5RJUYmvS+f9YPe WuMp7DqGZ2wHsCNhCu5Sl+E9QhDvCFSzuuj71AA/9Q11DWW7WFkOdf2qJCWiiPwa0nOv 8UuQlUTmaMj3hz0s1EbXOF49GIznutMW4P374fOF8Furb+QzBKol0mr087b4OU+H1omd XAmQ== X-Gm-Message-State: AFqh2koDUDlVTxpR0l/5gSIXpnJZGO2HZlJRhQjnhllkXnH1NVYOQ+Wz BRH6t9JMwsXGm0c8t5N+lb+tFZzlAaI= X-Google-Smtp-Source: AMrXdXsuQnidHP9UtNxfhIfNVn+hS4otI2YcokWsl6wDqJFdHAEeQLrkFb2JDyOvvTjdUq3/KL+SJg== X-Received: by 2002:a17:907:9a8a:b0:7c0:b944:fc4d with SMTP id km10-20020a1709079a8a00b007c0b944fc4dmr6367470ejc.3.1672331177817; Thu, 29 Dec 2022 08:26:17 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id z25-20020a170906945900b007c1633cea13sm8855393ejx.12.2022.12.29.08.26.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:26:17 -0800 (PST) Date: Thu, 29 Dec 2022 17:26:14 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] staging: rtl8192e: Rename TxPowerLevelOFDM24G... Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable TxPowerLevelOFDM24G to tx_pwr_level_ofdm_24g, TxPowerLevelOFDM24G_A to tx_pwr_level_ofdm_24g_a and TxPowerLevelOFDM24G_C to tx_pwr_level_ofdm_24g_c to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 12 ++++++------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index c121784bd810..618939dbfb13 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -410,7 +410,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) for (i =3D 0; i < 14; i++) { priv->tx_pwr_level_cck[i] =3D priv->EEPROMTxPowerLevelCCK[i]; - priv->TxPowerLevelOFDM24G[i] =3D + priv->tx_pwr_level_ofdm_24g[i] =3D priv->EEPROMTxPowerLevelOFDM24G[i]; } priv->LegacyHTTxPowerDiff =3D @@ -429,31 +429,31 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) for (i =3D 0; i < 3; i++) { priv->tx_pwr_level_cck_a[i] =3D priv->EEPROMRfACCKChnl1TxPwLevel[0]; - priv->TxPowerLevelOFDM24G_A[i] =3D + priv->tx_pwr_level_ofdm_24g_a[i] =3D priv->EEPROMRfAOfdmChnlTxPwLevel[0]; priv->tx_pwr_level_cck_c[i] =3D priv->EEPROMRfCCCKChnl1TxPwLevel[0]; - priv->TxPowerLevelOFDM24G_C[i] =3D + priv->tx_pwr_level_ofdm_24g_c[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[0]; } for (i =3D 3; i < 9; i++) { priv->tx_pwr_level_cck_a[i] =3D priv->EEPROMRfACCKChnl1TxPwLevel[1]; - priv->TxPowerLevelOFDM24G_A[i] =3D + priv->tx_pwr_level_ofdm_24g_a[i] =3D priv->EEPROMRfAOfdmChnlTxPwLevel[1]; priv->tx_pwr_level_cck_c[i] =3D priv->EEPROMRfCCCKChnl1TxPwLevel[1]; - priv->TxPowerLevelOFDM24G_C[i] =3D + priv->tx_pwr_level_ofdm_24g_c[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[1]; } for (i =3D 9; i < 14; i++) { priv->tx_pwr_level_cck_a[i] =3D priv->EEPROMRfACCKChnl1TxPwLevel[2]; - priv->TxPowerLevelOFDM24G_A[i] =3D + priv->tx_pwr_level_ofdm_24g_a[i] =3D priv->EEPROMRfAOfdmChnlTxPwLevel[2]; priv->tx_pwr_level_cck_c[i] =3D priv->EEPROMRfCCCKChnl1TxPwLevel[2]; - priv->TxPowerLevelOFDM24G_C[i] =3D + priv->tx_pwr_level_ofdm_24g_c[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[2]; } priv->LegacyHTTxPowerDiff =3D diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index ee6138699e10..19c65aaef3f6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -593,17 +593,17 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 c= hannel) =20 if (priv->epromtype =3D=3D EEPROM_93C46) { powerlevel =3D priv->tx_pwr_level_cck[channel - 1]; - powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G[channel-1]; + powerlevelOFDM24G =3D priv->tx_pwr_level_ofdm_24g[channel - 1]; } else if (priv->epromtype =3D=3D EEPROM_93C56) { if (priv->rf_type =3D=3D RF_1T2R) { powerlevel =3D priv->tx_pwr_level_cck_c[channel - 1]; - powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G_C[channel-1]; + powerlevelOFDM24G =3D priv->tx_pwr_level_ofdm_24g_c[channel - 1]; } else if (priv->rf_type =3D=3D RF_2T4R) { powerlevel =3D priv->tx_pwr_level_cck_a[channel - 1]; - powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G_A[channel-1]; + powerlevelOFDM24G =3D priv->tx_pwr_level_ofdm_24g_a[channel - 1]; =20 - ant_pwr_diff =3D priv->TxPowerLevelOFDM24G_C[channel-1] - - priv->TxPowerLevelOFDM24G_A[channel-1]; + ant_pwr_diff =3D priv->tx_pwr_level_ofdm_24g_c[channel - 1] + - priv->tx_pwr_level_ofdm_24g_a[channel - 1]; =20 priv->RF_C_TxPwDiff =3D ant_pwr_diff; =20 @@ -727,7 +727,7 @@ static void _rtl92e_set_tx_power_level(struct net_devic= e *dev, u8 channel) { struct r8192_priv *priv =3D rtllib_priv(dev); u8 powerlevel =3D priv->tx_pwr_level_cck[channel - 1]; - u8 powerlevelOFDM24G =3D priv->TxPowerLevelOFDM24G[channel-1]; + u8 powerlevelOFDM24G =3D priv->tx_pwr_level_ofdm_24g[channel - 1]; =20 switch (priv->rf_chip) { case RF_8225: diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index a74ef0125caa..a1274a5fdf44 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -473,9 +473,9 @@ struct r8192_priv { u8 tx_pwr_level_cck[14]; u8 tx_pwr_level_cck_a[14]; u8 tx_pwr_level_cck_c[14]; - u8 TxPowerLevelOFDM24G[14]; - u8 TxPowerLevelOFDM24G_A[14]; - u8 TxPowerLevelOFDM24G_C[14]; + u8 tx_pwr_level_ofdm_24g[14]; + u8 tx_pwr_level_ofdm_24g_a[14]; + u8 tx_pwr_level_ofdm_24g_c[14]; u8 LegacyHTTxPowerDiff; s8 RF_C_TxPwDiff; u8 AntennaTxPwDiff[3]; --=20 2.39.0 From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08DCAC4332F for ; Thu, 29 Dec 2022 16:27:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233837AbiL2Q06 (ORCPT ); Thu, 29 Dec 2022 11:26:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233845AbiL2Q02 (ORCPT ); Thu, 29 Dec 2022 11:26:28 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC993CE01 for ; Thu, 29 Dec 2022 08:26:26 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id tz12so46088041ejc.9 for ; Thu, 29 Dec 2022 08:26:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=a3s3KQ51G7iN+Q95ah8Lmo1iEkBKdbq/0OpGzR/t0yI=; b=i9VuJ5wtSUdxv56H3Fkd/wewLr1M3b+x4CPVeLYPzlKOWF3JutB5BIriOkgsTK0yYD kQ1ZC9LvjxzhrImTbPwKIfIhIgkRlzKFcnquJ74eJxn3h0cjTjU30FFXZQ5HI2pG1Qrv 13n7i2f68/ANbALeX6UeA2/wj4cv3BoAd7hcDs3jVn5qgCkJR0maFdznosd44nnvAh3l texqWIV6O3hSWXWN5v8mQOqqPo7eB1CYlvoXueb/093LrKXhUWmKKlKk1Xsykabb9SH5 4WHgmPVJM8RhAQ3C0xCyxyGsk9olYWl2p8WnLJ09Dqr5kDb/l52YwbuRnmh4HFjCljbx rbNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=a3s3KQ51G7iN+Q95ah8Lmo1iEkBKdbq/0OpGzR/t0yI=; b=yEwPhLHxB6F2FezWrr3+IdXgWLkyOxZR7SE5EH9lM+27fn/SyD+2mamdbF0rac1hEe 6zSaJqQoRE2JVjMf03MTQzLJlHY4qKw1gjLfVblY2WHb1BpDJeoIunTzOwvfduNDQWTt zMORxlm+wn4i3VlGVkwLjAHOl8Ek4wMC77ngo8+yZmQBFY2o4KTRhy0gNL9sPJ2SkqCf kKCgKXQbz1l4zNjCOCEftSKGxVE/45iWqRa0hpNUHar85AMmss2NZPD6bnf2sSxwnCcf ECwSVhKDl4c7ZhGrWoYTRK2lVOwjOgGVumlHrEnNgRsBIVS8SHpgwJjV8fqCbBEzR5aD H8ig== X-Gm-Message-State: AFqh2kowNERO3uJOXFggwzKzMCd87sFTrtHSMvWQpKF3OhP3a9XrRUsC bsvNCNJmTEM+Q4o8OCniDT0= X-Google-Smtp-Source: AMrXdXuTO4SMfzoukxRCQait7p/ML0b0M+geR4v/XGYHKr35sB3CJnYqNEd05rVv6c1Jw3LbeH98eQ== X-Received: by 2002:a17:907:8b95:b0:84c:95c7:302d with SMTP id tb21-20020a1709078b9500b0084c95c7302dmr300013ejc.5.1672331185565; Thu, 29 Dec 2022 08:26:25 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id v18-20020a170906181200b0077f324979absm8625680eje.67.2022.12.29.08.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:26:25 -0800 (PST) Date: Thu, 29 Dec 2022 17:26:23 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/7] staging: rtl8192e: Rename MCSTxPowerL.., LegacyHTTxPowe.. and AntennaTx.. Message-ID: <6e123b7a8d600cdc20ea7d4a8ae0b9638406b6a7.1672330343.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable MCSTxPowerLevelOriginalOffset to mcs_tx_pwr_level_org_offset, LegacyHTTxPowerDiff to legacy_ht_tx_pwr_diff and AntennaTxPwDiff to antenna_tx_pwr_diff to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../rtl8192e/rtl8192e/r8190P_rtl8256.c | 4 +-- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 +++++----- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 30 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/s= taging/rtl8192e/rtl8192e/r8190P_rtl8256.c index 7517ec001421..1672a3fea13c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -169,7 +169,7 @@ void rtl92e_set_ofdm_tx_power(struct net_device *dev, u= 8 powerlevel) u16 RegOffset[6] =3D {0xe00, 0xe04, 0xe10, 0xe14, 0xe18, 0xe1c}; u8 byte0, byte1, byte2, byte3; =20 - powerBase0 =3D powerlevel + priv->LegacyHTTxPowerDiff; + powerBase0 =3D powerlevel + priv->legacy_ht_tx_pwr_diff; powerBase0 =3D (powerBase0 << 24) | (powerBase0 << 16) | (powerBase0 << 8) | powerBase0; powerBase1 =3D powerlevel; @@ -177,7 +177,7 @@ void rtl92e_set_ofdm_tx_power(struct net_device *dev, u= 8 powerlevel) (powerBase1 << 8) | powerBase1; =20 for (index =3D 0; index < 6; index++) { - writeVal =3D (u32)(priv->MCSTxPowerLevelOriginalOffset[index] + + writeVal =3D (u32)(priv->mcs_tx_pwr_level_org_offset[index] + ((index < 2) ? powerBase0 : powerBase1)); byte0 =3D writeVal & 0x7f; byte1 =3D (writeVal & 0x7f00) >> 8; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 618939dbfb13..4a94c40f1930 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -413,12 +413,12 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) priv->tx_pwr_level_ofdm_24g[i] =3D priv->EEPROMTxPowerLevelOFDM24G[i]; } - priv->LegacyHTTxPowerDiff =3D + priv->legacy_ht_tx_pwr_diff =3D priv->EEPROMLegacyHTTxPowerDiff; - priv->AntennaTxPwDiff[0] =3D priv->EEPROMAntPwDiff & 0xf; - priv->AntennaTxPwDiff[1] =3D (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[0] =3D priv->EEPROMAntPwDiff & 0xf; + priv->antenna_tx_pwr_diff[1] =3D (priv->EEPROMAntPwDiff & 0xf0) >> 4; - priv->AntennaTxPwDiff[2] =3D (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[2] =3D (priv->EEPROMAntPwDiff & 0xf00) >> 8; priv->CrystalCap =3D priv->EEPROMCrystalCap; priv->ThermalMeter[0] =3D priv->EEPROMThermalMeter & 0xf; @@ -456,11 +456,11 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) priv->tx_pwr_level_ofdm_24g_c[i] =3D priv->EEPROMRfCOfdmChnlTxPwLevel[2]; } - priv->LegacyHTTxPowerDiff =3D + priv->legacy_ht_tx_pwr_diff =3D priv->EEPROMLegacyHTTxPowerDiff; - priv->AntennaTxPwDiff[0] =3D 0; - priv->AntennaTxPwDiff[1] =3D 0; - priv->AntennaTxPwDiff[2] =3D 0; + priv->antenna_tx_pwr_diff[0] =3D 0; + priv->antenna_tx_pwr_diff[1] =3D 0; + priv->antenna_tx_pwr_diff[2] =3D 0; priv->CrystalCap =3D priv->EEPROMCrystalCap; priv->ThermalMeter[0] =3D priv->EEPROMThermalMeter & 0xf; priv->ThermalMeter[1] =3D (priv->EEPROMThermalMeter & diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 19c65aaef3f6..cc7e72f2a52c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -535,9 +535,9 @@ static bool _rtl92e_bb_config_para_file(struct net_devi= ce *dev) =20 if (priv->IC_Cut > VERSION_8190_BD) { if (priv->rf_type =3D=3D RF_2T4R) - dwRegValue =3D priv->AntennaTxPwDiff[2]<<8 | - priv->AntennaTxPwDiff[1]<<4 | - priv->AntennaTxPwDiff[0]; + dwRegValue =3D priv->antenna_tx_pwr_diff[2] << 8 | + priv->antenna_tx_pwr_diff[1] << 4 | + priv->antenna_tx_pwr_diff[0]; else dwRegValue =3D 0x0; rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage, @@ -561,17 +561,17 @@ void rtl92e_get_tx_power(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 - priv->MCSTxPowerLevelOriginalOffset[0] =3D + priv->mcs_tx_pwr_level_org_offset[0] =3D rtl92e_readl(dev, rTxAGC_Rate18_06); - priv->MCSTxPowerLevelOriginalOffset[1] =3D + priv->mcs_tx_pwr_level_org_offset[1] =3D rtl92e_readl(dev, rTxAGC_Rate54_24); - priv->MCSTxPowerLevelOriginalOffset[2] =3D + priv->mcs_tx_pwr_level_org_offset[2] =3D rtl92e_readl(dev, rTxAGC_Mcs03_Mcs00); - priv->MCSTxPowerLevelOriginalOffset[3] =3D + priv->mcs_tx_pwr_level_org_offset[3] =3D rtl92e_readl(dev, rTxAGC_Mcs07_Mcs04); - priv->MCSTxPowerLevelOriginalOffset[4] =3D + priv->mcs_tx_pwr_level_org_offset[4] =3D rtl92e_readl(dev, rTxAGC_Mcs11_Mcs08); - priv->MCSTxPowerLevelOriginalOffset[5] =3D + priv->mcs_tx_pwr_level_org_offset[5] =3D rtl92e_readl(dev, rTxAGC_Mcs15_Mcs12); =20 priv->DefaultInitialGain[0] =3D rtl92e_readb(dev, rOFDM0_XAAGCCore1); @@ -609,13 +609,13 @@ void rtl92e_set_tx_power(struct net_device *dev, u8 c= hannel) =20 ant_pwr_diff &=3D 0xf; =20 - priv->AntennaTxPwDiff[2] =3D 0; - priv->AntennaTxPwDiff[1] =3D (u8)(ant_pwr_diff); - priv->AntennaTxPwDiff[0] =3D 0; + priv->antenna_tx_pwr_diff[2] =3D 0; + priv->antenna_tx_pwr_diff[1] =3D (u8)(ant_pwr_diff); + priv->antenna_tx_pwr_diff[0] =3D 0; =20 - u4RegValue =3D priv->AntennaTxPwDiff[2]<<8 | - priv->AntennaTxPwDiff[1]<<4 | - priv->AntennaTxPwDiff[0]; + u4RegValue =3D priv->antenna_tx_pwr_diff[2] << 8 | + priv->antenna_tx_pwr_diff[1] << 4 | + priv->antenna_tx_pwr_diff[0]; =20 rtl92e_set_bb_reg(dev, rFPGA0_TxGainStage, (bXBTxAGC|bXCTxAGC|bXDTxAGC), diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index a1274a5fdf44..30efc46c307c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -469,16 +469,16 @@ struct r8192_priv { s8 cck_present_attn; long undecorated_smoothed_pwdb; =20 - u32 MCSTxPowerLevelOriginalOffset[6]; + u32 mcs_tx_pwr_level_org_offset[6]; u8 tx_pwr_level_cck[14]; u8 tx_pwr_level_cck_a[14]; u8 tx_pwr_level_cck_c[14]; u8 tx_pwr_level_ofdm_24g[14]; u8 tx_pwr_level_ofdm_24g_a[14]; u8 tx_pwr_level_ofdm_24g_c[14]; - u8 LegacyHTTxPowerDiff; + u8 legacy_ht_tx_pwr_diff; s8 RF_C_TxPwDiff; - u8 AntennaTxPwDiff[3]; + u8 antenna_tx_pwr_diff[3]; =20 bool bDynamicTxHighPower; bool bDynamicTxLowPower; --=20 2.39.0 From nobody Tue Sep 16 19:42:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0DF4C4332F for ; Thu, 29 Dec 2022 16:27:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233848AbiL2Q1E (ORCPT ); Thu, 29 Dec 2022 11:27:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230369AbiL2Q0h (ORCPT ); Thu, 29 Dec 2022 11:26:37 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D7251401B for ; Thu, 29 Dec 2022 08:26:36 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id u18so25904118eda.9 for ; Thu, 29 Dec 2022 08:26:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=7X56oiCW3O33eo6MlmC7Nu2XKLGXqJJ4nlcMKqYmDmI=; b=MjN2zSMgQS/sFnqxqJ4awCudn7ywN/fdOkiVKWHofWgCyQUuPdQWBeFYpZluv13Wq5 RCicDrApDD7jj0VoD9tsyzxgJAbrkvajf6UpMNnNm6Twd5U6eYzEjuH1/dISFvWaUONU FoAD2jaLWgraT6TecWoqwCvEkrKBwPXai5WGhrRhFqofQOauaH06M17E+pC1x2S9KHSN Wfddw/hRG7rhjzIPsYjK9w+4cRyd1eDu8kjmIa9SvZqoo4AmhJXauEIttwtkbFadYjII 7ayp0YSGtODWxYlRlCptQ8QEryJt4s2JprinjTJdpn9EhaD3Z+yZETDpEf9YFChcxVHR rsIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7X56oiCW3O33eo6MlmC7Nu2XKLGXqJJ4nlcMKqYmDmI=; b=ESqU5HkK0z6MGdwhz6CeZel1fItoeluymKV3NkQFUVlaBIR41PHsWTi/bY2MU5+e8M Z7phnjso6lOlGvE5ib4LJRKw6ZN83LLGL48/FL7xR3rA7iv86HLHg9gV8I/cB7Y+yJFw BjCfPj/mTRocFhPh1p3vHNYKfuyMjGU/JiC75tVnHDWp2G7iInst7E+hMZ7r4BXRwEZ2 UrH3VLPN6kiD32CSz8jSkp0PDvIVueCf5oCICkvxG+jqexPzwRW949giSaOkgq+byKM4 uajBAkUkilmz3A/HjZd5y4fk4tFZA7VRzoyT6m70dUgUM4zt4b1lFdaeMSyBmR1mwmOS 1fkA== X-Gm-Message-State: AFqh2kog7QTU4NBjU57OlHvvY3W3Q+A3mSnkUvgHjXnS/o7jrhCoh1M8 n6NT04DYukRjeR4YpqRXBmr7b5oWfyA= X-Google-Smtp-Source: AMrXdXuOeHcRoWEw4CsCkN3krp9JFBh205GraX+io2Jk8HWie1860ZqrWCKPdU5A9/ndmydJv60oRQ== X-Received: by 2002:a05:6402:538f:b0:46d:76e1:a0de with SMTP id ew15-20020a056402538f00b0046d76e1a0demr313088edb.0.1672331195113; Thu, 29 Dec 2022 08:26:35 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id b15-20020aa7c90f000000b0046aa78ecd8asm8470886edt.3.2022.12.29.08.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Dec 2022 08:26:34 -0800 (PST) Date: Thu, 29 Dec 2022 17:26:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] staging: rtl8192e: Rename SetRFPowerSta.., RfReg0Value and bTXPowerDa.. Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable SetRFPowerStateInProgress to set_rf_pwr_state_in_progress, RfReg0Value to rf_reg_0value and bTXPowerDataReadFromEEPORM to tx_pwr_data_read_from_eeprom to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 40 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +-- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 4a94c40f1930..3cbe0218c0ee 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -345,9 +345,9 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) } =20 if (priv->card_8192_version > VERSION_8190_BD) - priv->bTXPowerDataReadFromEEPORM =3D true; + priv->tx_pwr_data_read_from_eeprom =3D true; else - priv->bTXPowerDataReadFromEEPORM =3D false; + priv->tx_pwr_data_read_from_eeprom =3D false; =20 priv->rf_type =3D RTL819X_DEFAULT_RF_TYPE; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index cc7e72f2a52c..2e9932a26382 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -101,17 +101,17 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, if (priv->rf_chip =3D=3D RF_8256) { rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0xf00, 0x0); if (Offset >=3D 31) { - priv->RfReg0Value[eRFPath] |=3D 0x140; + priv->rf_reg_0value[eRFPath] |=3D 0x140; rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->RfReg0Value[eRFPath]<<16)); + (priv->rf_reg_0value[eRFPath] << 16)); NewOffset =3D Offset - 30; } else if (Offset >=3D 16) { - priv->RfReg0Value[eRFPath] |=3D 0x100; - priv->RfReg0Value[eRFPath] &=3D (~0x40); + priv->rf_reg_0value[eRFPath] |=3D 0x100; + priv->rf_reg_0value[eRFPath] &=3D (~0x40); rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->RfReg0Value[eRFPath]<<16)); + (priv->rf_reg_0value[eRFPath] << 16)); =20 NewOffset =3D Offset - 15; } else @@ -130,10 +130,10 @@ static u32 _rtl92e_phy_rf_read(struct net_device *dev, bLSSIReadBackData); =20 if (priv->rf_chip =3D=3D RF_8256) { - priv->RfReg0Value[eRFPath] &=3D 0xebf; + priv->rf_reg_0value[eRFPath] &=3D 0xebf; =20 rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->RfReg0Value[eRFPath] << 16)); + (priv->rf_reg_0value[eRFPath] << 16)); =20 rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); } @@ -156,17 +156,17 @@ static void _rtl92e_phy_rf_write(struct net_device *d= ev, rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0xf00, 0x0); =20 if (Offset >=3D 31) { - priv->RfReg0Value[eRFPath] |=3D 0x140; + priv->rf_reg_0value[eRFPath] |=3D 0x140; rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->RfReg0Value[eRFPath] << 16)); + (priv->rf_reg_0value[eRFPath] << 16)); NewOffset =3D Offset - 30; } else if (Offset >=3D 16) { - priv->RfReg0Value[eRFPath] |=3D 0x100; - priv->RfReg0Value[eRFPath] &=3D (~0x40); + priv->rf_reg_0value[eRFPath] |=3D 0x100; + priv->rf_reg_0value[eRFPath] &=3D (~0x40); rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->RfReg0Value[eRFPath] << 16)); + (priv->rf_reg_0value[eRFPath] << 16)); NewOffset =3D Offset - 15; } else NewOffset =3D Offset; @@ -179,14 +179,14 @@ static void _rtl92e_phy_rf_write(struct net_device *d= ev, rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, DataAndAddr); =20 if (Offset =3D=3D 0x0) - priv->RfReg0Value[eRFPath] =3D Data; + priv->rf_reg_0value[eRFPath] =3D Data; =20 if (priv->rf_chip =3D=3D RF_8256) { if (Offset !=3D 0) { - priv->RfReg0Value[eRFPath] &=3D 0xebf; + priv->rf_reg_0value[eRFPath] &=3D 0xebf; rtl92e_set_bb_reg(dev, pPhyReg->rf3wireOffset, bMaskDWord, - (priv->RfReg0Value[eRFPath] << 16)); + (priv->rf_reg_0value[eRFPath] << 16)); } rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter4, 0x300, 0x3); } @@ -306,7 +306,7 @@ void rtl92e_config_mac(struct net_device *dev) u32 *pdwArray =3D NULL; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - if (priv->bTXPowerDataReadFromEEPORM) { + if (priv->tx_pwr_data_read_from_eeprom) { dwArrayLen =3D MACPHY_Array_PGLength; pdwArray =3D Rtl819XMACPHY_Array_PG; =20 @@ -1309,9 +1309,9 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, u8 i =3D 0, QueueID =3D 0; struct rtl8192_tx_ring *ring =3D NULL; =20 - if (priv->SetRFPowerStateInProgress) + if (priv->set_rf_pwr_state_in_progress) return false; - priv->SetRFPowerStateInProgress =3D true; + priv->set_rf_pwr_state_in_progress =3D true; =20 switch (priv->rf_chip) { case RF_8256: @@ -1331,7 +1331,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, netdev_err(dev, "%s(): Failed to initialize Adapter.\n", __func__); - priv->SetRFPowerStateInProgress =3D false; + priv->set_rf_pwr_state_in_progress =3D false; return false; } =20 @@ -1438,7 +1438,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, } } =20 - priv->SetRFPowerStateInProgress =3D false; + priv->set_rf_pwr_state_in_progress =3D false; return bResult; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 92260d098eaa..050f0435ab6d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -872,7 +872,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->rf_off_reason =3D 0; priv->rf_change_in_progress =3D false; priv->hw_rf_off_action =3D 0; - priv->SetRFPowerStateInProgress =3D false; + priv->set_rf_pwr_state_in_progress =3D false; priv->rtllib->pwr_save_ctrl.bLeisurePs =3D true; priv->rtllib->LPSDelayCnt =3D 0; priv->rtllib->sta_sleep =3D LPS_IS_WAKE; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 30efc46c307c..72b3c1869883 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -444,18 +444,18 @@ struct r8192_priv { =20 u8 nCur40MhzPrimeSC; =20 - u32 RfReg0Value[4]; + u32 rf_reg_0value[4]; u8 num_total_rf_path; bool brfpath_rxenable[4]; =20 - bool bTXPowerDataReadFromEEPORM; + bool tx_pwr_data_read_from_eeprom; =20 u16 reg_chnl_plan; u16 chnl_plan; u8 hw_rf_off_action; =20 bool rf_change_in_progress; - bool SetRFPowerStateInProgress; + bool set_rf_pwr_state_in_progress; bool bdisable_nic; =20 u8 DM_Type; --=20 2.39.0