From nobody Mon Sep 15 21:38:37 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 C2C5DC54EBD for ; Mon, 9 Jan 2023 19:08:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237538AbjAITIi (ORCPT ); Mon, 9 Jan 2023 14:08:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237542AbjAITI3 (ORCPT ); Mon, 9 Jan 2023 14:08:29 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89F4739FB9 for ; Mon, 9 Jan 2023 11:08:28 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id gh17so22657819ejb.6 for ; Mon, 09 Jan 2023 11:08:28 -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=TFoZZD8LmwoKwxtRMrcQl1iMqMdHwceJp7ycxW0TaVBkKDXE3wjNkomljwHAlG8l/2 A5IIo+K8J5R1vLNVNCqrNd9Ka5qxa+SSuxctHMJgm+e/rJApM2uwMEDhXBl+nzINhj9h D1LXvNht8HNxQ9h/LIJi49ycActMTGSOWKWOQnGVdUkeVS1JvAT5L2AQT5yNGhU+R4op QIgVwU045+VwFvtsA8TZygumzCmL8QAir2feCDUvtLfIvZkf6KQM1qGuFF92KfwcC9tg UH7lB/vr9R+2gK/ZVsjHOPehjsyZ6p0hUxorRirNdIsD9j83DL6Ude/JVxDkcKfGSL1G UX9A== 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=vLbPBDeHaHqn/qJAzg8lwR3+U7gCs5b/logaXCdf+4aICV/MGrt7yIovvVnWn6tn55 lVDJJxJICYSBHzHGQqS6kXbTVB/K79JQgzQNU+4q3mto+0N7RbOk8eQrLXxWlbHUTRZ+ 5LOn/ricaNuNKoCZR+IRiUEO+XwGcScmH/UlyXzGN7l7kihAFgz4DKY/n8moMMtiu5fs oLk1SZvwcvfvwa6P5sO4KXAC+5quas/SwiPFnnDKFEBh/NrDOCvCjxsqopz46R/n2Tcc /6AQPOSBiBz9kPRjagb1TLM2L8sTQKry/oOIdcKkTUBXaCkMI1pfKU49tjV/kOHl4QNc 1Xlw== X-Gm-Message-State: AFqh2krJWQsAQUOKfHdyOlhCvA2dgz45HhPiu/QkR0GbVVeFCmszOSIj oS51BJK7bOMIbd60f/HrMl4= X-Google-Smtp-Source: AMrXdXvHlEG9akMoa+0OXhI8w4vMSx5xTtepk+h8iZmdK4QSSVwM7MaaFnFi/ajNPe6nvHLno/8QDQ== X-Received: by 2002:a17:907:8b95:b0:84c:95c7:302d with SMTP id tb21-20020a1709078b9500b0084c95c7302dmr6110575ejc.5.1673291307022; Mon, 09 Jan 2023 11:08:27 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id ss17-20020a170907039100b0084debc3fdadsm788983ejb.188.2023.01.09.11.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:08:26 -0800 (PST) Date: Mon, 9 Jan 2023 20:08:24 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/7] staging: rtl8192e: Rename ChannelPlan, eeprom_ChannelPlan and CckPwEnl 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 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 Mon Sep 15 21:38:37 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 22D62C54EBD for ; Mon, 9 Jan 2023 19:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237516AbjAITJD (ORCPT ); Mon, 9 Jan 2023 14:09:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237530AbjAITIh (ORCPT ); Mon, 9 Jan 2023 14:08:37 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16915395C4 for ; Mon, 9 Jan 2023 11:08:36 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id vm8so22636456ejc.2 for ; Mon, 09 Jan 2023 11:08: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=GSqVE1Npu53dUzMwRfFPsKJ6inkj7DGO4q2n7SdPytE=; b=TesMS0/DQOi3fKCr2VJGm2ih+k3XV+kWtuMJRKQTasW3NylH6qTchH3fE+DuxsxdWg 9x3PIDRlDcpoIepR3Ed4BkTBkGWhgagu4upcv/kxEEgsjf6GClDM8z1IHcnmkHPqn+DU lsn7fxD6ya08HKC+KPwPsoUbt8WIL/zBq7i5GdpQxy7gKAxdP3BBIgPxWzIWtzipT4p+ LiXMnaL2mOTRm/KXC31HLVCvPkw5fKIpPikDi7AksW33wg5MJ95vFNjjMVyJhUJ28g1D iS++ccAkzE+3KkLBEWmYcAhbhAD83o4pox3DL7wSJ+fPZvhsiqulpgQUFvtxGfJS4cLf ClUw== 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=GSqVE1Npu53dUzMwRfFPsKJ6inkj7DGO4q2n7SdPytE=; b=AeL0c8rJcMMWnO+D351beJPkyzKIa0SxmLQLskCLk1YmALXu+bIWxZiMD1cn/jpfNy NrQP727jVlepct6vU5S+9kqbLaLv8Ww9Y1qxc2uo3WxOcakclSjRVivp5QJR/+eX1EwM 3XVivKrQktsGo4r4IpkBxo3XX0sjCQ5suxyVeYMnCrvNz1ejCB2ksb0JIEEMPTPQvXti 7/zkPjhgLmU8W6Q+NCHxrcbE49Wyq1hcRfErq5Bb6SpUKt/diqoqYr90NFFny04LrLt0 lConwGl6G4s5q+akWZNCip58f0iHocJ+79GID3OI4v/8P/jZisSXDXSevxTSCA+qS3ZU dL7A== X-Gm-Message-State: AFqh2koOV1SdY/eJ53oqOlKGnr8x/Sb172UyRM3x9+nmY4btBtkgAH0z UsLU8NgDncfJ+lbVxEApgjA= X-Google-Smtp-Source: AMrXdXvYvHRQEOVQLJyX1pVSaculzteW2U+AZXTiGy3kvUz4bxtPENj6VGNi77khMDlQQTEc2YOG9A== X-Received: by 2002:a17:906:6a1a:b0:7a6:65c:5104 with SMTP id qw26-20020a1709066a1a00b007a6065c5104mr16880421ejc.6.1673291314724; Mon, 09 Jan 2023 11:08:34 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id sh39-20020a1709076ea700b007c0e6d6bd10sm4090039ejc.132.2023.01.09.11.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:08:34 -0800 (PST) Date: Mon, 9 Jan 2023 20:08:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 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 --- V1 -> V2: Changed TSSI_13dBm to tssi_13dBm instead of tssi_13dbm --- 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..8b61c7581fe0 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..825cb8ce06c0 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..6cd49b3f6408 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 Mon Sep 15 21:38:37 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 7BF0BC61DB3 for ; Mon, 9 Jan 2023 19:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237590AbjAITJH (ORCPT ); Mon, 9 Jan 2023 14:09:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237561AbjAITIr (ORCPT ); Mon, 9 Jan 2023 14:08:47 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA0E7395FF for ; Mon, 9 Jan 2023 11:08:45 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id fc4so22583415ejc.12 for ; Mon, 09 Jan 2023 11:08:45 -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=dN85jDDbS9++X72ZVzQ9zBzrc025p4BbE5KdWzs6teU=; b=dYLebetn+ue1TzjRxs86nXaH4dOwnQ3mPO1MjAjPdrANYUoFmIf2tju0M6myLkPK5a zOpuMhHvKiEkATgJeLESWvHLQ0XKK9KZ9E3NhE6neN6zs1/wqU5WMwtgzcFYLLYEpjwf Vx/YbLHP4xYHrLIym+Im1oSz4ZkUXlLFBuF0OonxlvVnbFd6npZR1AM1NisSydVJalSZ bk+ibOF5tW2hkUwXiIj6ufYeIg2w5laGCEN/BdUu63ncUPB+pD4nYScXeS5xmxEC7hkr LjnI0mMUbpQtxlDiR9T6PHdpw7M0TsUV4Hr/thr81BmaPBX7vdqv+TJAli3d5m3PwlRX hjDg== 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=dN85jDDbS9++X72ZVzQ9zBzrc025p4BbE5KdWzs6teU=; b=Qmanb+QjLsPTrmN/08xRj+t8n/c2PStQv4+PS4DQEejLpAn0rzlZ+Zp+1c9f11ihQa WL/fWlMzbxBe7s6nOHDSxAFFuVLn3syMge3qf8mNu0d9qfCHFLNsMw7fOAimCqMYNHou 4wUUjVQFQd9fgz7JCmg+jeK2e7d+R6OGt5xj4FAPMPEqoT6qZRDrLsChIt8PdD2IlF3H Kfu1RKbi+YXYGuTarkc30UFkXA2MFmXPZ6Hp9BI2FtCTVsQTsopJvRxFoCeK2a8dOf0D JKZTzIGrbATfVCotuAC+By+rB7Iyd2CnooHK06jQ5wSSefmvT1sjZRG1Ww3XxGqIc35R C7pg== X-Gm-Message-State: AFqh2kpGbuOF6Gc9L3oOrtsHVYgvMP0aKFzcSjKYunUGbbUm6lqDfL+V dAvaXuwRgHyk1+qrBPJSkOuj54eqBo4= X-Google-Smtp-Source: AMrXdXs4DHQlacg6eIYe0Vg6eSoumPw5RMsJl5MHx50rRk9HXh2TK6Dwb6VfNdLWVHW4zqHhPJ24wQ== X-Received: by 2002:a17:906:308c:b0:7b2:91e8:155c with SMTP id 12-20020a170906308c00b007b291e8155cmr13682743ejv.5.1673291324420; Mon, 09 Jan 2023 11:08:44 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id fu17-20020a170907b01100b0084c723b4c40sm4115507ejc.103.2023.01.09.11.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:08:43 -0800 (PST) Date: Mon, 9 Jan 2023 20:08:41 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/7] staging: rtl8192e: Rename CCKPresentAtt... Message-ID: <1254f23aefd25075ef3e16719eed79b461f41e4c.1673290428.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 8b61c7581fe0..5c5326491e90 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 825cb8ce06c0..344b2c92843a 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 6cd49b3f6408..6d3c9491d070 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 Mon Sep 15 21:38:37 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 8D442C6379F for ; Mon, 9 Jan 2023 19:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237610AbjAITJJ (ORCPT ); Mon, 9 Jan 2023 14:09:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237597AbjAITIz (ORCPT ); Mon, 9 Jan 2023 14:08:55 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 941CD3C391 for ; Mon, 9 Jan 2023 11:08:54 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id cf18so16301891ejb.5 for ; Mon, 09 Jan 2023 11:08:54 -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=4ZMU1x+tLk0OFGwO9qk4HxCl3v2Y+JR1fHam1odju/4=; b=OB/LTABusMIttSRpolHRGe2RIiuDWHWG13bN3ppO4WyfcRn+a/WDmaR1YjSQAcrmcA k2ez60PSPSRmPBqqGOuElxT+rBcglhwwfky4BmwEnG+Z/+Jh/p1rzD7sXxnXbjUJxpZB uACAgleEtJ4v+FWb4b0S96F5XaZl8DeG+L60CF7ZM02KUrT2zjbIiq8TSivFsqgIml+E Bajz2jXwHY22zTkgxXINxTnD3FEeDuGGhg7SR0PG05efzSLfQStfTCCrvb9a+lfq0xqn cLZcpyquyPf40ugaOiDBXxiBAYEShj+oRapZQ9Eyc4B9say5O4ozSEpqNplDsCCYTozc zXbQ== 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=4ZMU1x+tLk0OFGwO9qk4HxCl3v2Y+JR1fHam1odju/4=; b=xI5qQVrrk9SBEFxwXGPRf1/rX9v+BwMxeVskyDQ/6IHGT+eBjaSzVaTOhMWQXT4++I NGaE2eR5vRmsj6Db49tAt6UgPw0JZUYsKkbKmiNfTTcg8x+t+Zq3Iq38vBlw7d+3XqpH wrrSqU42Mc+BNKskB0OiWnqjMDZSBzwbxVV6gNKIs9PUvZgNYNNd/9NFVdkg8uTWHUiA og+YXHhj5MNRCjyubHbp9CBfwxcXgt5iuL7CSEK7r0NewkDuZiDcCXc/VLNsoXMgEtil 45J1gZoOAQyb/d9pF2lrDn3r8b5NGWyGu9siBamXakFk170yvJOk11In12+N/nWQVKru 623w== X-Gm-Message-State: AFqh2krZmIz5i5zxicFmdj4WACtTqfEqISfAdOg9V98v6dkLkLEhNGj4 cWptNuk33NE8gAYKuJCdHonHElI2SxQ= X-Google-Smtp-Source: AMrXdXu7ZDtWWQPtPguBBWqpEMGojFE8xUIljZYuY0yg54sMXqwaB0eOISFjJKxDpzY58FR4Lv4TuA== X-Received: by 2002:a17:906:9c85:b0:7c0:d7af:fce3 with SMTP id fj5-20020a1709069c8500b007c0d7affce3mr12499739ejc.1.1673291333241; Mon, 09 Jan 2023 11:08:53 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id gn19-20020a1709070d1300b00815835b4b5fsm4038886ejc.134.2023.01.09.11.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:08:52 -0800 (PST) Date: Mon, 9 Jan 2023 20:08:51 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/7] staging: rtl8192e: Rename TxPowerLevelCCK... 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 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 5c5326491e90..ec817de1ca59 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 344b2c92843a..1efaea925b3a 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 Mon Sep 15 21:38:37 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 D82DDC61DB3 for ; Mon, 9 Jan 2023 19:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237035AbjAITJb (ORCPT ); Mon, 9 Jan 2023 14:09:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237548AbjAITJE (ORCPT ); Mon, 9 Jan 2023 14:09:04 -0500 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9DFA3FC85 for ; Mon, 9 Jan 2023 11:09:01 -0800 (PST) Received: by mail-ed1-x530.google.com with SMTP id r26so14024568edc.5 for ; Mon, 09 Jan 2023 11:09:01 -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=CcTDCJVTG9eANRkVa7iv7hN1YnFrfeblrrLWZBP7MBA=; b=XxdrcDNU+mPGWv4xYhF9ZKoaX8Wen2hDHRNorvUoqyY0dRverQMCyhqHmVGAX8Q7mJ e0NSRKgKAndlG7QhIKcG9lZFWdaw1i4LmoIDl+sMTxhv3MH1hbWQePfFAoJO4anP7kim 9vHnexrQRxFsT/LVdmrMUG0AuFN0J5Q62HOgolRhApMYcFIvuQfOd53m3tOIeugD8wpJ R3Uvq8+9YKAJSsI/extdmMCSdIrbsEtLbAbvhYT0EuFXqy0m9eYi4uQG1Ny9TVX7p0Bq 3QAwAs7iTzjkFB7vMh6W20LKyDOQ4MkrjRJ+5XzM19IUwjLSVwD58Rk9vUM4m6ueyox9 dVDg== 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=CcTDCJVTG9eANRkVa7iv7hN1YnFrfeblrrLWZBP7MBA=; b=jqgHZo17EQ87KCtRd+IcDNiJk/rB1WJh9Hyvq/EpQF5y4d4jTS2/eIc6s7tQof0KKl qk35rOCLgyOYddiTApK2T89gVYADW44Lwi5xut7p3vFGrBo3SGankycBjxGvMSASPezK SyEWDFxWCH9WJgVbG4uI5h9RZq7xYxVrD76flG6Kw5kU4bN22sst5rF42y+YwEvSoA6x K0ENZVQnUCNgvoLmerV9CaEKBSTKNHk3Au6Lds7MW0WKsLTUuF8PoG1QjrOceSUFRfIN jh6sK0OfSijRyFFTJklVYBPbyPk9Bm1M5aPwaSxLrIUG9YLYEwXRJIREjzUDw14oB5Sq +aOQ== X-Gm-Message-State: AFqh2kpMn0S2nLCg+HAXbed3EcnU1GkC5HhWthELsuuazjdJq16Xhg4a K7X7AsORm8UMrk6BxtAyZfU= X-Google-Smtp-Source: AMrXdXtdW+VT/dvka9eu9/AVlIGH3zj7xjzBP+UJpSEXcx5DHfhiwwCjvZnqkxwrj/+zYqtjypaFVw== X-Received: by 2002:aa7:d1c9:0:b0:48c:a058:8897 with SMTP id g9-20020aa7d1c9000000b0048ca0588897mr7546484edp.3.1673291340281; Mon, 09 Jan 2023 11:09:00 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id 11-20020a170906318b00b0078d3f96d293sm4082658ejy.30.2023.01.09.11.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:08:59 -0800 (PST) Date: Mon, 9 Jan 2023 20:08:58 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/7] staging: rtl8192e: Rename TxPowerLevelOFDM24G... Message-ID: <6bb354bd6f6387a26378de3b154d975b826a1a88.1673290428.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 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 ec817de1ca59..ab9e2265df6f 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 1efaea925b3a..ca61fc60db6e 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 Mon Sep 15 21:38:37 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 E82E7C54EBD for ; Mon, 9 Jan 2023 19:09:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237543AbjAITJf (ORCPT ); Mon, 9 Jan 2023 14:09:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237597AbjAITJK (ORCPT ); Mon, 9 Jan 2023 14:09:10 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27BE13D1FA for ; Mon, 9 Jan 2023 11:09:09 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id az20so3566323ejc.1 for ; Mon, 09 Jan 2023 11:09:09 -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=Zjv16lVnrOe4MOuLDfPurVOd0YQaBZRZ/Lo343Vt4Hc=; b=kl7J2GBCUBGug/lBcnD09rnaH4OP5/pDhZdLaR5W9i2Gmk1lOvqXlJnAa+Hj85+gyL 6ImsqFjdy7s3qwlVMH2el2pzx9yKvzBtryEkUKIbYKWwZ3Inm9UQlMhqHJgA6srSPubf 2Fn65ZtxYW+xpptShGkhydi0iAnmZzbpetZzfsIAfil/mk1ujcrN79uRHuCekWwJbInl RXvGo9CKd19DWhykjhey+5TIS1wbICBnJpO0XAygpL8q0JFLGCOu4EgrExNp4MMaR1g2 7D4Az5wGDeXgnSktjeRefNp2zoGAAEPdgKDavpqCHHcM1vS8ucXVUyPLKYhGa7F5IxmW x7Zw== 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=Zjv16lVnrOe4MOuLDfPurVOd0YQaBZRZ/Lo343Vt4Hc=; b=medIGxt0BlvfrHbxN859TvYstgjfS9KOxElwllRGSdZWCwKQHvrBMihnUX4FY2O19O iyR0hH3h/CabjQiRt1MDn3B+/464SU6DgtcTXqHvEC3mNwk36+iiRxAmjMDH6OUr921M sAXA0xRQ23jjvY64ySGPBiNIjEEjc8Tu4EPruQtNXrdbdnzBrufmsDuWUEtPhu9w+YO2 JZ5Ro3YVOjjvZeA/sKm4uMMK7XxoYtrX+WMNNeCTHUvfRAHHMKuVRHtDK3sCLIFvE2+u C2NQLTWpCuhGDE39f7fmNzfMK2K407pqic0TKaGZeC7maV1iynrxDVgChMMUxWaBIDe6 m7OQ== X-Gm-Message-State: AFqh2kpmMUfslKuDtWEwlzliTkpaWwSdceW383MwitHyz/2R1LeJccdQ 7SV51Sud2jOATozEmDEVQzoXMNZpkQs= X-Google-Smtp-Source: AMrXdXsjd0ojc6Ck3GaLPzWei6Oar8qzCxROQgcTVi2r5rxJKZ2xGCKzpkTE0GPUFjgWv1vmDdvJIg== X-Received: by 2002:a17:906:aec4:b0:84d:269e:7b01 with SMTP id me4-20020a170906aec400b0084d269e7b01mr2480382ejb.0.1673291347719; Mon, 09 Jan 2023 11:09:07 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id uk41-20020a170907ca2900b0078d9b967962sm4065109ejc.65.2023.01.09.11.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:09:07 -0800 (PST) Date: Mon, 9 Jan 2023 20:09:05 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/7] staging: rtl8192e: Rename MCSTxPowerL.., LegacyHTTxPowe.. and AntennaTx.. Message-ID: <271b3a9e1c23593e9ead925eb8415a584058fb56.1673290428.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 ab9e2265df6f..06ab02230125 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 ca61fc60db6e..cc3e2816e657 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 Mon Sep 15 21:38:37 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 04B97C67871 for ; Mon, 9 Jan 2023 19:10:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237555AbjAITJh (ORCPT ); Mon, 9 Jan 2023 14:09:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237618AbjAITJQ (ORCPT ); Mon, 9 Jan 2023 14:09:16 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87B333B937 for ; Mon, 9 Jan 2023 11:09:15 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id i15so14060709edf.2 for ; Mon, 09 Jan 2023 11:09:15 -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=ZI4QNYHAsoqJCIbKwCF4KbxUOqKXYFqsYQ+1I8J7L9A=; b=KeuCh0wCp6/fkrCV+b7lipshXbHWdWeLJLV+uyA0HVd7egVd5zzRkZ1LUeB7lJnW5b JyktUsLZClLwML0jvBrLvMhX1gdZivmQ7lCz6cZZH19klIyoU9W7qtDivZXa9n47tbpp ALMjq7YQp/pPoE4jrtGIEk+N5UTTdoF/YUnvSJYWC1hlK9IM3wjiaekqU8mqsIuAcezP oXdYDlHShjkWLHwKF8pXchC+8ZDADZct4XAR9na8JLiovrjknRAYkJJ7ZCK2w1qpvJK2 iKZ0SUzhQLT9bccYgK8cl81sAeKbRWP+EzSf4d2Nlydjof3/QNXt3ObZJGmgu6IX8XVg uBQQ== 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=ZI4QNYHAsoqJCIbKwCF4KbxUOqKXYFqsYQ+1I8J7L9A=; b=kZBbmaDrtJqdMTJzxjAb2v7q1QSSLiEKv51OuDEqbdu6MEMwYohyNJI8H+NGBFiBQb BiCXT3/p7NhuEHdoi38aGLv+NbYCOBUgbl5ousgwjMtjezUgOkXGEedWg9SnBUvIFonZ TqkXA99BSdJOoQ5vtCSySNY2Z+t1kmQFdmSBC86pzoycl+ZzlFKOZ89TXL/eXTXdMx/x 8sTMvM9reXijMwfTh3Yq1pbdlRZNK3HEgHVAe0HH3EbhJGXwXYxi8tbb2SgL5Dn/9X5V rQODUOCnuSWiZ79bRasOnI4L3t2aTKatR6NDuBkMH0w0EziDUlObsrMHVPJocgfEHaqb XUkA== X-Gm-Message-State: AFqh2kqORtI2vikcTDrWQbPVLSPmC22a4H3mZy9F6NxnaHXRN0AZaNQT oQtmIWZDEOC5N6jePqi5na8= X-Google-Smtp-Source: AMrXdXuD4MlMKwuEwJVAD+D5BX/tAz1GAS6ckQ8kHmmpf93LnSQ8Q2N6IECunQt8abziuA7mJ+Bzlw== X-Received: by 2002:a05:6402:207c:b0:490:ff75:7aa with SMTP id bd28-20020a056402207c00b00490ff7507aamr3522527edb.1.1673291354140; Mon, 09 Jan 2023 11:09:14 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id p9-20020aa7d309000000b0046776f98d0csm4062977edq.79.2023.01.09.11.09.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 11:09:13 -0800 (PST) Date: Mon, 9 Jan 2023 20:09:11 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v2 7/7] staging: rtl8192e: Rename SetRFPowerSta.., RfReg0Value and bTXPowerDa.. Message-ID: <01ff54a2c135ba6e3d06255102679d496fd2aef1.1673290428.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 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 06ab02230125..ebf1fa5ec295 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 cc3e2816e657..ad34bef5660c 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