From nobody Mon Sep 15 06:15:01 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 65CB6C3DA78 for ; Sun, 15 Jan 2023 20:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231564AbjAOUVB (ORCPT ); Sun, 15 Jan 2023 15:21:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231561AbjAOUUr (ORCPT ); Sun, 15 Jan 2023 15:20:47 -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 C6B8713513 for ; Sun, 15 Jan 2023 12:20:43 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id ss4so56437101ejb.11 for ; Sun, 15 Jan 2023 12:20:43 -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=mMkhVziKXAjeT1z9GbTnob0aeQTSn+K+39faEGee5Co=; b=Le7lD0qmg+buPtR9hnglVFLeR+5+lKwOddiQD3VXDLUN5P0OptA/Amluf3e9R27HpW qzou6bZ0eAfhECQJ6nONdtX6J3/ob1KSOYWF1Wiktw5OwI3RXARtLK60zTbCxTIyEo8y rWyYYRtyMYNjD3W8E83TXcdJG9IZWbgd+P/UiptpJ1t3KshSLrjl/0bgVPwnIXksTjR8 bEQxlq6ZyoNSIuaEOemMmDQZceKs7gZPBIGZqIOZKIpgQ+OEIdqFsIOfDfkBl2YV56vN ru2zKsmFt2q9xZ/cdDs92gmcrwjIpBZmeZonwen9vTqXAnzrWU4p2HmtW/uUYO2Oth2L HqXA== 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=mMkhVziKXAjeT1z9GbTnob0aeQTSn+K+39faEGee5Co=; b=ZMM5CDUG4Txzkkr3ePxc4VoHkLV2m/gb+UurJrMk0wVYhwSc+kLv5FetTtAWw5K+6d q1BlHehSZKelpBDeIg2M+JKvsmrI6zQmv/h+QUfS9uUvmYlPzli7xpAwVRuR8ak7S8C5 sx/GBTO4t33NLzBAeWqML0l0HIb4zf/JbTmrw26H7I3yehK4TcuZRzWwCf6R1ytl+W70 ose/MAgFQ1kvyhbDDnkMwo0xmfx4VzQZ3Kv8sfZPV0Jc3+EmvC6E2WN7CS44ugOKtIef E3D5Ck5Fhfd1exR1/sNoBjKd8qzwtbOvqhyQQv1PlR02TvLCrnxTJWYNbvbC8xfSt93C A9Vg== X-Gm-Message-State: AFqh2kp6pVRGgPR9Piz5/YTgrUGYWRHW00vZ08ZybDHvP/FSUI96m4jO YFsp+fwmDbE0K4V/ip3Pff200xL9Ou8= X-Google-Smtp-Source: AMrXdXu2VnEeskyIc1jSIa8XyiiFyZfnRJs0piB7YA5I8TeHTSCbki5f6DtqE1y22D5M/1sBTm7wvQ== X-Received: by 2002:a17:906:9c8e:b0:7c1:6150:ad2b with SMTP id fj14-20020a1709069c8e00b007c16150ad2bmr20587873ejc.0.1673814042378; Sun, 15 Jan 2023 12:20:42 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id ov38-20020a170906fc2600b0084d4733c428sm8525942ejb.88.2023.01.15.12.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:20:41 -0800 (PST) Date: Sun, 15 Jan 2023 21:20:40 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Rename SetBWModeIn.., SwChnlInPro.. and ThermalMet.. 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 SetBWModeInProgress to set_bw_mode_in_progress, SwChnlInProgress to sw_chnl_in_progress and ThermalMeter to thermal_meter 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 | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++----- 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 734a097ee268..1499e6b2fa39 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -421,8 +421,8 @@ static void _rtl92e_read_eeprom_info(struct net_device = *dev) priv->antenna_tx_pwr_diff[2] =3D (priv->EEPROMAntPwDiff & 0xf00) >> 8; priv->CrystalCap =3D priv->EEPROMCrystalCap; - priv->ThermalMeter[0] =3D priv->EEPROMThermalMeter & 0xf; - priv->ThermalMeter[1] =3D (priv->EEPROMThermalMeter & + priv->thermal_meter[0] =3D priv->EEPROMThermalMeter & 0xf; + priv->thermal_meter[1] =3D (priv->EEPROMThermalMeter & 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->CrystalCap =3D priv->EEPROMCrystalCap; - priv->ThermalMeter[0] =3D priv->EEPROMThermalMeter & 0xf; - priv->ThermalMeter[1] =3D (priv->EEPROMThermalMeter & + priv->thermal_meter[0] =3D priv->EEPROMThermalMeter & 0xf; + priv->thermal_meter[1] =3D (priv->EEPROMThermalMeter & 0xf0) >> 4; } } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 59b2e8385ef7..2af6763707d0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -954,7 +954,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) netdev_err(dev, "%s(): Driver is not initialized\n", __func__); return false; } - if (priv->SwChnlInProgress) + if (priv->sw_chnl_in_progress) return false; =20 =20 @@ -987,7 +987,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) break; } =20 - priv->SwChnlInProgress =3D true; + priv->sw_chnl_in_progress =3D true; if (channel =3D=3D 0) channel =3D 1; =20 @@ -998,7 +998,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channe= l) =20 if (priv->up) _rtl92e_phy_switch_channel_work_item(dev); - priv->SwChnlInProgress =3D false; + priv->sw_chnl_in_progress =3D false; return true; } =20 @@ -1101,7 +1101,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_= device *dev) u8 regBwOpMode; =20 if (priv->rf_chip =3D=3D RF_PSEUDO_11N) { - priv->SetBWModeInProgress =3D false; + priv->set_bw_mode_in_progress =3D false; return; } if (!priv->up) { @@ -1190,7 +1190,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_= device *dev) } =20 atomic_dec(&(priv->rtllib->atm_swbw)); - priv->SetBWModeInProgress =3D false; + priv->set_bw_mode_in_progress =3D false; } =20 void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width band= width, @@ -1199,11 +1199,11 @@ void rtl92e_set_bw_mode(struct net_device *dev, enu= m ht_channel_width bandwidth, struct r8192_priv *priv =3D rtllib_priv(dev); =20 =20 - if (priv->SetBWModeInProgress) + if (priv->set_bw_mode_in_progress) return; =20 atomic_inc(&(priv->rtllib->atm_swbw)); - priv->SetBWModeInProgress =3D true; + priv->set_bw_mode_in_progress =3D true; =20 priv->CurrentChannelBW =3D bandwidth; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index ed9ddb2f987b..edc02a61a92d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -435,12 +435,12 @@ struct r8192_priv { u8 EEPROMLegacyHTTxPowerDiff; =20 u8 CrystalCap; - u8 ThermalMeter[2]; + u8 thermal_meter[2]; =20 - u8 SwChnlInProgress; + u8 sw_chnl_in_progress; u8 SwChnlStage; u8 SwChnlStep; - u8 SetBWModeInProgress; + u8 set_bw_mode_in_progress; =20 u8 n_cur_40mhz_prime_sc; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 0e278b872470..96c45e5172bd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -794,11 +794,11 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(s= truct net_device *dev) return; if (tmpRegA >=3D 12) tmpRegA =3D 12; - priv->ThermalMeter[0] =3D ThermalMeterVal; - priv->ThermalMeter[1] =3D ThermalMeterVal; + priv->thermal_meter[0] =3D ThermalMeterVal; + priv->thermal_meter[1] =3D ThermalMeterVal; =20 - if (priv->ThermalMeter[0] >=3D (u8)tmpRegA) { - tmpOFDMindex =3D tmpCCK20Mindex =3D 6+(priv->ThermalMeter[0] - + if (priv->thermal_meter[0] >=3D (u8)tmpRegA) { + tmpOFDMindex =3D tmpCCK20Mindex =3D 6+(priv->thermal_meter[0] - (u8)tmpRegA); tmpCCK40Mindex =3D tmpCCK20Mindex - 6; if (tmpOFDMindex >=3D OFDM_Table_Length) @@ -808,7 +808,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(str= uct net_device *dev) if (tmpCCK40Mindex >=3D CCK_Table_length) tmpCCK40Mindex =3D CCK_Table_length-1; } else { - tmpval =3D (u8)tmpRegA - priv->ThermalMeter[0]; + tmpval =3D (u8)tmpRegA - priv->thermal_meter[0]; if (tmpval >=3D 6) { tmpOFDMindex =3D 0; tmpCCK20Mindex =3D 0; --=20 2.39.0