From nobody Mon Sep 15 06:12:58 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 388C8C3DA78 for ; Sun, 15 Jan 2023 20:21:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231563AbjAOUVL (ORCPT ); Sun, 15 Jan 2023 15:21:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231610AbjAOUVF (ORCPT ); Sun, 15 Jan 2023 15:21:05 -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 3A84CCDC7 for ; Sun, 15 Jan 2023 12:21:01 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id ss4so56438129ejb.11 for ; Sun, 15 Jan 2023 12:21: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=DrcHpDAznuQD/6gaEXJ1kSYqjTyGuN9vC1MPEK+KavU=; b=HCBHzCmySYICU8fJw3pW7HWruJ7N3jyNt6rtktF+esocEOTMfhIInjQhr+DIGx2VrF vcEcfutoXXGM2O1unBl4+5gpprq5LTAFjSUuBBUORpezLJ/nifBcg9YJXEdNUuaQgtcY mFt+58sL6+Q6MMrKdLYdXoe82A17LlnC6cW4pgWwWn3DKiDvlucc2ccYu1bxLdygFzaP eTJe+9PYPBGYnK+NPXhvT8B3xYJr37pUoTMCGzTzMY33YeZK/Ik4odEZj2bWr7Tkhq5D jjMkJoUe6doYPHuOMUJj1aZDeqjlVAfnjoV1bkfMIxPJWn3fukE027rDw6ZKwulNxpUW oCdg== 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=DrcHpDAznuQD/6gaEXJ1kSYqjTyGuN9vC1MPEK+KavU=; b=fP4UKK8Tx9laDrbwnt3s2O/VPW1H6QgIFV8s0+2pTFv9B3L0DlpfhAEuTjxYJBBZnK K90LEfQt5/SDpEtn4C5pNquPbEaD0suz4ggB/MeCPWgD2DintEgNvcCaeicPl8qp6bG9 /uLOesf+yu96BKXv2cMY8FLg4XwCEPwKxCClkuZ+1zscKRDbflfQ77/srzTVY+iyIPK7 2HAveUAb8jb4Pm35Gd3C4eC1berbka/+YDZt7Kfddm3Yn94I5fTkR4nDMfY9Lcr3b2tF HAEsKvAFCRrrY/7kkVI1nYk0rfau2V6DKKYdp9h4yNV7h/SjPNUA3BgHUp3KjHyyeG3f WHuQ== X-Gm-Message-State: AFqh2koVjVhroxtNEVY9Ofv+0YA+xIMSoeuB6llnc7kpK4Qs7tWuqB6J 7T9a+9vs52EW6n+4gbjNpmA= X-Google-Smtp-Source: AMrXdXvL4w3nHAuHA3Yw8EuR0m70zgg8hIbGbFq2qz4vUpdj7MSscRkilh8NhayPJzkldNF/ZptjgA== X-Received: by 2002:a17:906:3512:b0:862:e612:f00e with SMTP id r18-20020a170906351200b00862e612f00emr3446078eja.5.1673814060810; Sun, 15 Jan 2023 12:21:00 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id la19-20020a170907781300b007aee7ca1199sm11059196ejc.10.2023.01.15.12.21.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:21:00 -0800 (PST) Date: Sun, 15 Jan 2023 21:20:58 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Rename EEPROMTherma.., EEPROMAntPw.. and EEPROMTxPow.. 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 EEPROMThermalMeter to eeprom_thermal_meter, EEPROMAntPwDiff to eeprom_ant_pwr_diff and EEPROMTxPowerLevelOFDM24G to eeprom_tx_pwr_level_ofdm24g to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 28 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index df8cdea5ee95..655a7966a876 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -366,22 +366,22 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) } =20 if (!priv->AutoloadFailFlag) - priv->EEPROMThermalMeter =3D ((rtl92e_eeprom_read(dev, + priv->eeprom_thermal_meter =3D ((rtl92e_eeprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00) >> 8; else - priv->EEPROMThermalMeter =3D EEPROM_Default_ThermalMeter; - priv->tssi_13dBm =3D priv->EEPROMThermalMeter * 100; + priv->eeprom_thermal_meter =3D EEPROM_Default_ThermalMeter; + priv->tssi_13dBm =3D priv->eeprom_thermal_meter * 100; =20 if (priv->epromtype =3D=3D EEPROM_93C46) { if (!priv->AutoloadFailFlag) { usValue =3D rtl92e_eeprom_read(dev, EEPROM_TxPwDiff_CrystalCap >> 1); - priv->EEPROMAntPwDiff =3D usValue & 0x0fff; + priv->eeprom_ant_pwr_diff =3D usValue & 0x0fff; priv->eeprom_crystal_cap =3D (usValue & 0xf000) >> 12; } else { - priv->EEPROMAntPwDiff =3D + priv->eeprom_ant_pwr_diff =3D EEPROM_Default_AntTxPowerDiff; priv->eeprom_crystal_cap =3D EEPROM_Default_TxPwDiff_CrystalCap; @@ -402,7 +402,7 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) (EEPROM_TxPwIndex_OFDM_24G + i) >> 1); else usValue =3D EEPROM_Default_TxPower; - *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i])) + *((u16 *)(&priv->eeprom_tx_pwr_level_ofdm24g[i])) =3D usValue; } } @@ -411,18 +411,18 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) priv->tx_pwr_level_cck[i] =3D priv->EEPROMTxPowerLevelCCK[i]; priv->tx_pwr_level_ofdm_24g[i] =3D - priv->EEPROMTxPowerLevelOFDM24G[i]; + priv->eeprom_tx_pwr_level_ofdm24g[i]; } priv->legacy_ht_tx_pwr_diff =3D priv->eeprom_legacy_ht_tx_pwr_diff; - priv->antenna_tx_pwr_diff[0] =3D priv->EEPROMAntPwDiff & 0xf; - priv->antenna_tx_pwr_diff[1] =3D (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[0] =3D priv->eeprom_ant_pwr_diff & 0xf; + priv->antenna_tx_pwr_diff[1] =3D (priv->eeprom_ant_pwr_diff & 0xf0) >> 4; - priv->antenna_tx_pwr_diff[2] =3D (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[2] =3D (priv->eeprom_ant_pwr_diff & 0xf00) >> 8; priv->crystal_cap =3D priv->eeprom_crystal_cap; - priv->thermal_meter[0] =3D priv->EEPROMThermalMeter & 0xf; - priv->thermal_meter[1] =3D (priv->EEPROMThermalMeter & + priv->thermal_meter[0] =3D priv->eeprom_thermal_meter & 0xf; + priv->thermal_meter[1] =3D (priv->eeprom_thermal_meter & 0xf0) >> 4; } else if (priv->epromtype =3D=3D EEPROM_93C56) { =20 @@ -462,8 +462,8 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->antenna_tx_pwr_diff[1] =3D 0; priv->antenna_tx_pwr_diff[2] =3D 0; priv->crystal_cap =3D priv->eeprom_crystal_cap; - priv->thermal_meter[0] =3D priv->EEPROMThermalMeter & 0xf; - priv->thermal_meter[1] =3D (priv->EEPROMThermalMeter & + priv->thermal_meter[0] =3D priv->eeprom_thermal_meter & 0xf; + priv->thermal_meter[1] =3D (priv->eeprom_thermal_meter & 0xf0) >> 4; } } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 4a2b4f01507e..9cb717892dcb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -423,13 +423,13 @@ struct r8192_priv { u16 eeprom_chnl_plan; =20 u8 EEPROMTxPowerLevelCCK[14]; - u8 EEPROMTxPowerLevelOFDM24G[14]; + u8 eeprom_tx_pwr_level_ofdm24g[14]; u8 EEPROMRfACCKChnl1TxPwLevel[3]; u8 EEPROMRfAOfdmChnlTxPwLevel[3]; u8 EEPROMRfCCCKChnl1TxPwLevel[3]; u8 EEPROMRfCOfdmChnlTxPwLevel[3]; - u16 EEPROMAntPwDiff; - u8 EEPROMThermalMeter; + u16 eeprom_ant_pwr_diff; + u8 eeprom_thermal_meter; u8 eeprom_crystal_cap; =20 u8 eeprom_legacy_ht_tx_pwr_diff; --=20 2.39.0