Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp2293084rwb; Sun, 15 Jan 2023 12:37:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXt5crT530cWKeujYhINwY93VU8aRHBquJOFZumlnGxS79QuZU5G827jlaSQdyrd0ZYrusjf X-Received: by 2002:a17:902:fe0c:b0:193:38b3:530d with SMTP id g12-20020a170902fe0c00b0019338b3530dmr23842110plj.36.1673815020308; Sun, 15 Jan 2023 12:37:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673815020; cv=none; d=google.com; s=arc-20160816; b=D3WLxfnwcuM+YBWv8gxa+aY6L4hN/BxNIgU68KdUOQKWEivL4OhktiG4sA+DLhE+WC LjfvNvuV9mTIdvJNJazYus6Ntb2rS8kNurHDw6b4xA/0AU7NRL6rXIGGKMOgq+lNtefb DECkLfdTSuIhABC2J5HvHE/kw9k+uH6guCMxoKBpPtbx38wLwCpC63W9K5gkQAquTee4 tu2YY3nc5+pj5aXSHV2ZaActB6ZslTfCOMj31i23QqPvmJZvTzvMnGouZUoUMX0R36rI biDIEMhcA+iJs5nyy4Fp+I++O5WZOlcZ/43k/m6uf1gr4V2uPYlXX5wI907Bj6b4wIp8 WgkQ== 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=3IxK8DpXvkR4uchbGfoXdnD/22mDhbHmb/J1TTixnGM=; b=eICJvTCinZVzKB6FQn+5SCbHYBrNhb8rP6fclVMXIX5OmsAm7tPriEFzaB03JAqB2a RAXK6AjkitZWE2yoxthXXYHNgycg0IG6mLKbya3pU0X67zckH6eTaDZe7WKBqB/Q2cua JnLwAkDwKW9CnIwgi4sG6HlKYPynuvjuxa7gOchDvVQvayYC/xnsGicyS4qajS0erMPx LPCExCyK1+h4q2HO4uh8o0SjqoA6o2z6iEZ07D7AYwW88O8QpUHZshkDOv09wmqfl8dt qfglxL4PZAafORrxQN2mnKG+APYSOVFB8RJAzwhguhIi4PobCXsopb8utDC+cSo0S7u9 518w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ZAMAEjTt; 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 b10-20020a170902bd4a00b00189bae9d928si24852832plx.162.2023.01.15.12.36.54; Sun, 15 Jan 2023 12:37:00 -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=ZAMAEjTt; 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 S231329AbjAOUUV (ORCPT + 52 others); Sun, 15 Jan 2023 15:20:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231549AbjAOUUQ (ORCPT ); Sun, 15 Jan 2023 15:20:16 -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 75B4F1351E for ; Sun, 15 Jan 2023 12:20:14 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id u9so63743880ejo.0 for ; Sun, 15 Jan 2023 12:20:14 -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=3IxK8DpXvkR4uchbGfoXdnD/22mDhbHmb/J1TTixnGM=; b=ZAMAEjTtCW2nWjyyGx8PE2nzQQGpNlo/bT8oy34Ht/nsT9yar0mZ+3FKyWBL48eKEk ddVDTzFsyddQ8cbK/uASLlOulscT2V6iAsKjc6unClX2KaAlRs2AUOjHidNQWf0HSExN dnfeP3ElO0BFwSM1jVUaczp3jhfoLHL/cq3MdJCSPpx/47dhBZQ3t828LtgIPv+NLpAo PBM+HbVjXcb6f5uf2bGBXJQcJty4b8820gt5StMg8IKnMnoKH+/jK/nP+f6F/DMKWNS0 S86YLB0HLOfg/COI3G3n+sJgueU8PqDoMabXUSEnWzBn1rsHaOdVSg53Vvmn1ohqhvg3 z65A== 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=3IxK8DpXvkR4uchbGfoXdnD/22mDhbHmb/J1TTixnGM=; b=kVFp5qrvGT/+EBH/s3Fj/XaWHM+3JO5iIbsOb3HKqxCOVqM7ObH5FkUXuPi8x8HsZG q+NfBIPYUncLHG9NXEIDPDjd4v78HL9pMsSOP7abP+lcIXmCOYuZKKKf5WNKPo48CB33 GIDss6rZm05COJ3KX1gYLpWKquoMSQdMhaUOvhS+ncx7D3F+VpCtYGJqRpqK0+f2Okdh X6y9jbiMF7kgpXoFxn9dXm5E2LzyPO8oLXXgRni+ftWCez/CeL2l5EIOaMXPMbM1q5Dx w+DONGmbYGzjtoayLB8BOmPPOqq/kRNodX4G44coUaUXHx5IZv2/Ork7UsnmYw4CnW4f 3eFQ== X-Gm-Message-State: AFqh2krp8zNN5zPe0Er8BTUCexEnPabd+62qnWEfvXjJbyKcNNocLtw7 11AUAOMBJmS5PCxJWQX3U/A= X-Received: by 2002:a17:906:d8ba:b0:870:fc65:37a with SMTP id qc26-20020a170906d8ba00b00870fc65037amr51393ejb.3.1673814013009; Sun, 15 Jan 2023 12:20:13 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id ku5-20020a170907788500b0086ca5a99a15sm2184625ejc.80.2023.01.15.12.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:20:12 -0800 (PST) Date: Sun, 15 Jan 2023 21:20:10 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Rename Record_CCK_2.., Record_CCK_4.. and DefaultIn.. Message-ID: <2963e704afae2382bb7fded0453adbc4a8d48db3.1673812849.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 Record_CCK_20Mindex to rec_cck_20m_idx, Record_CCK_40Mindex to rec_cck_40m_idx and DefaultInitialGain to def_initial_gain to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 7ba60d93b9b3..a0233281ad94 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -574,10 +574,10 @@ void rtl92e_get_tx_power(struct net_device *dev) priv->mcs_tx_pwr_level_org_offset[5] = rtl92e_readl(dev, rTxAGC_Mcs15_Mcs12); - priv->DefaultInitialGain[0] = rtl92e_readb(dev, rOFDM0_XAAGCCore1); - priv->DefaultInitialGain[1] = rtl92e_readb(dev, rOFDM0_XBAGCCore1); - priv->DefaultInitialGain[2] = rtl92e_readb(dev, rOFDM0_XCAGCCore1); - priv->DefaultInitialGain[3] = rtl92e_readb(dev, rOFDM0_XDAGCCore1); + priv->def_initial_gain[0] = rtl92e_readb(dev, rOFDM0_XAAGCCore1); + priv->def_initial_gain[1] = rtl92e_readb(dev, rOFDM0_XBAGCCore1); + priv->def_initial_gain[2] = rtl92e_readb(dev, rOFDM0_XCAGCCore1); + priv->def_initial_gain[3] = rtl92e_readb(dev, rOFDM0_XDAGCCore1); priv->framesync = rtl92e_readb(dev, rOFDM0_RxDetector3); priv->framesyncC34 = rtl92e_readl(dev, rOFDM0_RxDetector2); @@ -1072,13 +1072,13 @@ static void _rtl92e_cck_tx_power_track_bw_switch_thermal(struct net_device *dev) switch (priv->CurrentChannelBW) { case HT_CHANNEL_WIDTH_20: - if (priv->Record_CCK_20Mindex == 0) - priv->Record_CCK_20Mindex = 6; - priv->cck_index = priv->Record_CCK_20Mindex; + if (priv->rec_cck_20m_idx == 0) + priv->rec_cck_20m_idx = 6; + priv->cck_index = priv->rec_cck_20m_idx; break; case HT_CHANNEL_WIDTH_20_40: - priv->cck_index = priv->Record_CCK_40Mindex; + priv->cck_index = priv->rec_cck_40m_idx; break; } rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index fea5f547b7be..af377f7c7f7b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -499,11 +499,11 @@ struct r8192_priv { u8 ofdm_index[2]; u8 cck_index; - u8 Record_CCK_20Mindex; - u8 Record_CCK_40Mindex; + u8 rec_cck_20m_idx; + u8 rec_cck_40m_idx; struct init_gain initgain_backup; - u8 DefaultInitialGain[4]; + u8 def_initial_gain[4]; bool bis_any_nonbepkts; bool bcurrent_turbo_EDCA; bool bis_cur_rdlstate; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index f03b479a9143..9789cdd8ac15 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -823,8 +823,8 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev) else tmpCCKindex = tmpCCK20Mindex; - priv->Record_CCK_20Mindex = tmpCCK20Mindex; - priv->Record_CCK_40Mindex = tmpCCK40Mindex; + priv->rec_cck_20m_idx = tmpCCK20Mindex; + priv->rec_cck_40m_idx = tmpCCK40Mindex; if (priv->rtllib->current_network.channel == 14 && !priv->bcck_in_ch14) { @@ -1378,12 +1378,12 @@ static void _rtl92e_dm_initial_gain(struct net_device *dev) dm_digtable.cur_ig_value = gain_range; } else { if (dm_digtable.cur_ig_value == 0) - dm_digtable.cur_ig_value = priv->DefaultInitialGain[0]; + dm_digtable.cur_ig_value = priv->def_initial_gain[0]; else dm_digtable.cur_ig_value = dm_digtable.pre_ig_value; } } else { - dm_digtable.cur_ig_value = priv->DefaultInitialGain[0]; + dm_digtable.cur_ig_value = priv->def_initial_gain[0]; dm_digtable.pre_ig_value = 0; } -- 2.39.0