Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp6678946rwl; Mon, 9 Jan 2023 11:28:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvfCJe7d8YAxZio9NkzKoIh/KP6ILUOytEo8UGHdhcUCARcKngyaCw/nrAuK0d2Gmq2+fWh X-Received: by 2002:a17:90b:92:b0:225:eda7:13e with SMTP id bb18-20020a17090b009200b00225eda7013emr51756650pjb.40.1673292501726; Mon, 09 Jan 2023 11:28:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673292501; cv=none; d=google.com; s=arc-20160816; b=ieWUmQHwTC++IMJ5Dj4WZOv1U0Wby3dHiSqhUbO99JZBQhmUchvFV7DTMGI03kaUEG mNEgiiy7+EhCXe5L1c2jb89op6RRdKukgB46uyRVOd3dng+doYjRlRUHT65qaUSjWY3O vlQy/nYqT5msXka8IFtNfzYY9lBGgQAHPsoiK8xgTaCB0mkaHQ12jyO2ZxmEIUmpokj5 YpBr//bWiYMV8ubp3N6vV9VJCT3I2VJaWajjMqsAFwM9pNkx6ehIb1YCge8MmP63Hcux RnXsdJYnGnS6tUxK3pKIKlbJwWsRctZbqdm95P+UluglfHKu66LOIu/icUzZV/CE7MVG vXRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=CcTDCJVTG9eANRkVa7iv7hN1YnFrfeblrrLWZBP7MBA=; b=acOm76kK6kIg0qjW0UmoYephF8h/bmlJn6+hJ8lsea0qJ+4UaAf8I9/YrzCllP17Rb sRKZ7sufpMxBtSPjFabD44aZ/xpALP0YqkFsC/E7dOyt9IrHI4WqdEQcPV2FKFcSRInE bjTZVh9jqnjKBBARAV0Rc2LqldcLevwyyLsDP9VWSeHebp4oWJj8uSqavCEUYZsDVTzI PuEXLPJn9cjswVxE6KJQDaMUCB5CVtRadPTPWYTRzpCPPXpxoLWqnRNz0Al0S2FS3bb0 4RIVuYXuF8U4sMmxTXGHKAGSZhZCourx9O1tKKRE91uqwEGqnvCa/pulBjRZ6NhYhm64 prbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XxdrcDNU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bj18-20020a056a02019200b004790511049csi9909031pgb.596.2023.01.09.11.28.15; Mon, 09 Jan 2023 11:28:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=XxdrcDNU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236688AbjAITJ3 (ORCPT + 53 others); Mon, 9 Jan 2023 14:09:29 -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-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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/staging/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 = 0; i < 14; i++) { priv->tx_pwr_level_cck[i] = priv->EEPROMTxPowerLevelCCK[i]; - priv->TxPowerLevelOFDM24G[i] = + priv->tx_pwr_level_ofdm_24g[i] = priv->EEPROMTxPowerLevelOFDM24G[i]; } priv->LegacyHTTxPowerDiff = @@ -429,31 +429,31 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) for (i = 0; i < 3; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[0]; - priv->TxPowerLevelOFDM24G_A[i] = + priv->tx_pwr_level_ofdm_24g_a[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[0]; priv->tx_pwr_level_cck_c[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[0]; - priv->TxPowerLevelOFDM24G_C[i] = + priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[0]; } for (i = 3; i < 9; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[1]; - priv->TxPowerLevelOFDM24G_A[i] = + priv->tx_pwr_level_ofdm_24g_a[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[1]; priv->tx_pwr_level_cck_c[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[1]; - priv->TxPowerLevelOFDM24G_C[i] = + priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[1]; } for (i = 9; i < 14; i++) { priv->tx_pwr_level_cck_a[i] = priv->EEPROMRfACCKChnl1TxPwLevel[2]; - priv->TxPowerLevelOFDM24G_A[i] = + priv->tx_pwr_level_ofdm_24g_a[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[2]; priv->tx_pwr_level_cck_c[i] = priv->EEPROMRfCCCKChnl1TxPwLevel[2]; - priv->TxPowerLevelOFDM24G_C[i] = + priv->tx_pwr_level_ofdm_24g_c[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[2]; } priv->LegacyHTTxPowerDiff = diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/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 channel) if (priv->epromtype == EEPROM_93C46) { powerlevel = priv->tx_pwr_level_cck[channel - 1]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1]; + powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; } else if (priv->epromtype == EEPROM_93C56) { if (priv->rf_type == RF_1T2R) { powerlevel = priv->tx_pwr_level_cck_c[channel - 1]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G_C[channel-1]; + powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g_c[channel - 1]; } else if (priv->rf_type == RF_2T4R) { powerlevel = priv->tx_pwr_level_cck_a[channel - 1]; - powerlevelOFDM24G = priv->TxPowerLevelOFDM24G_A[channel-1]; + powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g_a[channel - 1]; - ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1] - - priv->TxPowerLevelOFDM24G_A[channel-1]; + ant_pwr_diff = priv->tx_pwr_level_ofdm_24g_c[channel - 1] + - priv->tx_pwr_level_ofdm_24g_a[channel - 1]; priv->RF_C_TxPwDiff = ant_pwr_diff; @@ -727,7 +727,7 @@ static void _rtl92e_set_tx_power_level(struct net_device *dev, u8 channel) { struct r8192_priv *priv = rtllib_priv(dev); u8 powerlevel = priv->tx_pwr_level_cck[channel - 1]; - u8 powerlevelOFDM24G = priv->TxPowerLevelOFDM24G[channel-1]; + u8 powerlevelOFDM24G = priv->tx_pwr_level_ofdm_24g[channel - 1]; 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]; -- 2.39.0