From patchwork Sun Jan 15 20:19:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp887670wrn; Sun, 15 Jan 2023 12:20:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXs58NqjX1bXwYB4UUtuatZTITNg1GON2qzcQklRuHZAQ6LkFQ37DRhepTWyqM8K1HYpZxjA X-Received: by 2002:a17:90b:4c4d:b0:229:6f70:7a68 with SMTP id np13-20020a17090b4c4d00b002296f707a68mr2098276pjb.33.1673814033987; Sun, 15 Jan 2023 12:20:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814033; cv=none; d=google.com; s=arc-20160816; b=tWp7TUCGgkE8MQfy0NTk2ssVltkA8iWTCBhGl/S7uEZEmzgN2LlOza0Y0OrbXQscM+ L/251diAKD98rG5HDdLf8ARC41G9cvfHwFL/wDpw518W+MLSlkaxVfOLdzY0B+7KD/Dg s9cW9Wsgbc97CfZzHH21CA8Ec7a4UivMx/AWpOVYOyXSsV1W0X0AvprWJcdZdCquW6Ef 857B8jSPTKTBriXEYI0xYiiX+paVLSy559JKTA0wbBcBCWeUg326lmkv2kH1LZhQqKgg 0t2/SCkt9llW8PR6az7mlH+GInxUS6rJ3FZUovw8cEFKeJljccF9/K7aacBDViYUFnd3 QsFg== 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=04yBUYjfgAWOng38rhO9oZktPB+8MCP7LPU6LUdsNzs=; b=nZO6jEQqGZjl/nKDBRnmagzsgMMkoY3ZiXNL+gY9dc1brvmwOcROLJMKj1McswFTLl 5Cjw+JAzLh9At0u0MVOfv5saalHWakJCQRwy4MBtFixSJ+wwTkaGbGuRKQNig3t7EZOu f72oYvcU3uP6J8T5LFqligcatrSpquz39TYyweB7fdEG2HwT69iKTq2qF8aHvfnOLM4Y CijF/Z95KQh+SHbAG63TvxJMY5k+p+80LXj4JTGLIv+xybEsZf+9O5IQ9hn6a1wIIYVg 9reeVnKFA+9lAfQoi+KifDrW2Bxee2MeMyjOCpG3D0eGlC9/HTH1qpu9BMoGeFg2qqLo BKzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hmwcsW8F; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lr2-20020a17090b4b8200b0022949f5ca1esi5757604pjb.86.2023.01.15.12.20.22; Sun, 15 Jan 2023 12:20:33 -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=hmwcsW8F; 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 S231204AbjAOUTk (ORCPT + 99 others); Sun, 15 Jan 2023 15:19:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231372AbjAOUTh (ORCPT ); Sun, 15 Jan 2023 15:19:37 -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 444CE12F35 for ; Sun, 15 Jan 2023 12:19:35 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id ud5so63734064ejc.4 for ; Sun, 15 Jan 2023 12:19:35 -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=04yBUYjfgAWOng38rhO9oZktPB+8MCP7LPU6LUdsNzs=; b=hmwcsW8F0h3YafaNsxN75zUgV80WF+pEIftfBrxjteAQGRJaONL8K0Hd2gI3j5JMsC 3af4ILWZ5eTRbWXTa760hx5djUFM4Xp8g7uhl+jHIhynjioZJhYBCfI3sbe637Mo1Dqq 7UB6WJSaUuxToSKQsgp8p+OEl+oUosvA3Jo92OBTtwCYwzaQbAvqItQZ7efoWzypFKIP 8HqhfKrPGGieF5hmEy2bU4x1hVby97aiJqRirECQe6FVh6XAt6OsPX46W2V/9kk4u6JB YAoD9i07KmLTnRCReLVsP9FhQ3q37m5q8JHmp/+QNWznFU890qK4M8y1GksMICPUAZOQ 66bQ== 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=04yBUYjfgAWOng38rhO9oZktPB+8MCP7LPU6LUdsNzs=; b=dYgxo3mkHxiB+ri961SDlActCly2b223ipQSRH1vWIjfpZTJoFVy9oI2kwDOThZfay CwXag+jNPyfU4XIWmrCpdjwRHudDvcJpKNjRK+qPk7DdcKNaoXQ029ZnzQvN2OMJnLth CGp2UwLU5QOqGqXbeTWaj0DBaXceXm2YmgkXoYmKP+qFUhZ/kw9we5+Tc483VJfx9IPh nLn8a1JzPsU7veTTsDXUzySPwCzQN0lSFBPMtifCotTpoyE0VLClDSRxp8UVIAJr4TbM Zfo8+/AwEHR6D896tovyPyxoSjTn3ZtKVQs7DPcBDn7eyY9awp6+mT8IHG3tUzYitDy+ BZEQ== X-Gm-Message-State: AFqh2kp+nIBQcaVKjl/AdrRdDxrhCXfg3MOdJ4y3LMvgc6jldED85+aD 8Obbdz5xvSEPYtbwue0lvjs= X-Received: by 2002:a17:907:cc98:b0:870:8300:a0a5 with SMTP id up24-20020a170907cc9800b008708300a0a5mr253735ejc.0.1673813973839; Sun, 15 Jan 2023 12:19:33 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id s1-20020aa7c541000000b00495c3573b36sm10738407edr.32.2023.01.15.12.19.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:19:33 -0800 (PST) Date: Sun, 15 Jan 2023 21:19:31 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Rename bDynamicTxHig.., bDynamicTxL.. and bLastDTPF.. Message-ID: <585a76cf4d2c805eada805c18c18ef207b9a4ea4.1673812849.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121224919600001?= X-GMAIL-MSGID: =?utf-8?q?1755121224919600001?= Rename variable bDynamicTxHighPower to dynamic_tx_high_pwr, bDynamicTxLowPower to dynamic_tx_low_pwr and bLastDTPFlag_High to last_dtp_flag_high to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../rtl8192e/rtl8192e/r8190P_rtl8256.c | 4 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 34 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c index 1672a3fea13c..2c1a4392aeff 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -150,7 +150,7 @@ void rtl92e_set_cck_tx_power(struct net_device *dev, u8 powerlevel) struct r8192_priv *priv = rtllib_priv(dev); TxAGC = powerlevel; - if (priv->bDynamicTxLowPower) { + if (priv->dynamic_tx_low_pwr) { if (priv->CustomerID == RT_CID_819x_Netcore) TxAGC = 0x22; else @@ -198,7 +198,7 @@ void rtl92e_set_ofdm_tx_power(struct net_device *dev, u8 powerlevel) priv->pwr_track = writeVal_tmp; } - if (priv->bDynamicTxHighPower) + if (priv->dynamic_tx_high_pwr) writeVal = 0x03030303; else writeVal = (byte3 << 24) | (byte2 << 16) | diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index ad34bef5660c..1f8bfe83b8ef 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -480,9 +480,9 @@ struct r8192_priv { s8 RF_C_TxPwDiff; u8 antenna_tx_pwr_diff[3]; - bool bDynamicTxHighPower; - bool bDynamicTxLowPower; - bool bLastDTPFlag_High; + bool dynamic_tx_high_pwr; + bool dynamic_tx_low_pwr; + bool last_dtp_flag_high; bool bLastDTPFlag_Low; u8 rfa_txpowertrackingindex; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 6d3c9491d070..09ea3a6f373c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -2271,10 +2271,10 @@ static void _rtl92e_dm_init_dynamic_tx_power(struct net_device *dev) struct r8192_priv *priv = rtllib_priv(dev); priv->rtllib->bdynamic_txpower_enable = true; - priv->bLastDTPFlag_High = false; + priv->last_dtp_flag_high = false; priv->bLastDTPFlag_Low = false; - priv->bDynamicTxHighPower = false; - priv->bDynamicTxLowPower = false; + priv->dynamic_tx_high_pwr = false; + priv->dynamic_tx_low_pwr = false; } static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) @@ -2284,8 +2284,8 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) unsigned int txlowpower_threshold = 0; if (!priv->rtllib->bdynamic_txpower_enable) { - priv->bDynamicTxHighPower = false; - priv->bDynamicTxLowPower = false; + priv->dynamic_tx_high_pwr = false; + priv->dynamic_tx_low_pwr = false; return; } if ((priv->rtllib->ht_info->IOTPeer == HT_IOT_PEER_ATHEROS) && @@ -2299,28 +2299,28 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) if (priv->rtllib->state == RTLLIB_LINKED) { if (priv->undecorated_smoothed_pwdb >= txhipower_threshold) { - priv->bDynamicTxHighPower = true; - priv->bDynamicTxLowPower = false; + priv->dynamic_tx_high_pwr = true; + priv->dynamic_tx_low_pwr = false; } else { if (priv->undecorated_smoothed_pwdb < - txlowpower_threshold && priv->bDynamicTxHighPower) - priv->bDynamicTxHighPower = false; + txlowpower_threshold && priv->dynamic_tx_high_pwr) + priv->dynamic_tx_high_pwr = false; if (priv->undecorated_smoothed_pwdb < 35) - priv->bDynamicTxLowPower = true; + priv->dynamic_tx_low_pwr = true; else if (priv->undecorated_smoothed_pwdb >= 40) - priv->bDynamicTxLowPower = false; + priv->dynamic_tx_low_pwr = false; } } else { - priv->bDynamicTxHighPower = false; - priv->bDynamicTxLowPower = false; + priv->dynamic_tx_high_pwr = false; + priv->dynamic_tx_low_pwr = false; } - if ((priv->bDynamicTxHighPower != priv->bLastDTPFlag_High) || - (priv->bDynamicTxLowPower != priv->bLastDTPFlag_Low)) { + if ((priv->dynamic_tx_high_pwr != priv->last_dtp_flag_high) || + (priv->dynamic_tx_low_pwr != priv->bLastDTPFlag_Low)) { rtl92e_set_tx_power(dev, priv->rtllib->current_network.channel); } - priv->bLastDTPFlag_High = priv->bDynamicTxHighPower; - priv->bLastDTPFlag_Low = priv->bDynamicTxLowPower; + priv->last_dtp_flag_high = priv->dynamic_tx_high_pwr; + priv->bLastDTPFlag_Low = priv->dynamic_tx_low_pwr; } From patchwork Sun Jan 15 20:19:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp887684wrn; Sun, 15 Jan 2023 12:20:39 -0800 (PST) X-Google-Smtp-Source: AMrXdXuRD8X6kk5+6SBeOUhjcmOXH5OYjWdCVHStUIhOWIWNG8zq2OCSi75n7kEn1lK7PT83Ikaq X-Received: by 2002:a05:6a20:3c8a:b0:af:8128:757 with SMTP id b10-20020a056a203c8a00b000af81280757mr134678282pzj.61.1673814039475; Sun, 15 Jan 2023 12:20:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814039; cv=none; d=google.com; s=arc-20160816; b=FutlmMhQeJn7kv/PAS/qbfTBCUYKU6W/F9n40wEZfLPDq2elLPCB6EXgvFx2C+3u9i pktU3aXO/VAA8ojVPRcUa88CJgGYoGMrBf0sR/9ksdUi53by5XJhjlib8NRr2Ir3AvMx djpwH0k/Dw8jfF0AUGYOjizCJjt1j+6iMaYO8GHc1u8FhcizPO9ABj/MkHW4yJNmjEFP eg3lRRluJMhlNXL9Dhl9a9btAooy6leOYdCJSob0HjwjrFfY4eCl8+rFwS2kjhhjfI4Y 25HegY6Wn2esaPmCxfW7pynC0Jgu44rVDUpBXBj8G9plKf6y8EdKWxeExbhg1vN0Fn3F uFeQ== 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=sDFl1W46f2cV4qdUFqvY9KWQZn/TRnQQe1hsN+H8lHs=; b=QHvtiV5QcIze+hjVKHphLl37AKVcpHsZE1gPe5OP9JwrBFj8JPDpUmkvHAhw4wXp6l XsgghPS3Lr+sCaMkYS59DPi76ptNgyHJYwHfBkJvFiU693kLb4fkfx/7wBQ3adlzsfND tkevZoCq/40HhBop3kjLCIP1N4H6ErQ6KoYpmTNNM5PEeL3I0xw1ATeqvnRP+P8udwFW ux/Umxq2WQ48cbtT8AWble1jvtrIfQ8/KuCdIVH+fRPWrTB0vzt0WPRjclx+rjvCw7Z4 uucTR1MnO8eY8VwEdWqGztRr7ar8RyUX8+q2q4ZPU9lEhs/VeLOxw2bQyUW2NnRQyO/U pWLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PvIZbY87; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w5-20020a63f505000000b004790f3fc790si27304727pgh.510.2023.01.15.12.20.27; Sun, 15 Jan 2023 12:20:39 -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=PvIZbY87; 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 S231500AbjAOUUF (ORCPT + 99 others); Sun, 15 Jan 2023 15:20:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230354AbjAOUUB (ORCPT ); Sun, 15 Jan 2023 15:20:01 -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 E8AEC12F26 for ; Sun, 15 Jan 2023 12:19:59 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id v6so20692335ejg.6 for ; Sun, 15 Jan 2023 12:19:59 -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=sDFl1W46f2cV4qdUFqvY9KWQZn/TRnQQe1hsN+H8lHs=; b=PvIZbY87D0mRbiY8FzjH2sdm7HLeqz/4AAtnXWEKMm5/rH1DJARloa+W4o6HCvV1l5 hOrsa/oVmR9OLrPbQ46rl7QdsX0+kocsKV8fsc3NaE92WAK1JL7MUPpcOilXkcD47kGP k9aQhxWORMGkdG15+ZpvAPWjIRvZWXvkEcIOVmFBCXJqP56nkuoFQpNADN6yROWuhWhr /0NRMdbtE6C/uNwdwv1eF4t+E8LU2KtwzOJOCk8mc56jv7okEZfamEtPelWuvzpN34Ot Tvfj5LWDh7yX36OemeH36IZLQ3cqohUbMUE6a3EGZK8JhEsEz9pQNfW3MIaJBZC5beAl XbVA== 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=sDFl1W46f2cV4qdUFqvY9KWQZn/TRnQQe1hsN+H8lHs=; b=lwEBGUDP81RsEie3C7M+Y9E0Hk6Bi80HZQY4iJUZ8692lhW06HhK5dytg9B8ZDaedy /ERJ68L5lWZweD1HksfXyBeXJH3LieobjT2uYdTXYwHf8mySNsqL/q78JiRfRt2EivTe N6sKnyhbp6sJ+KFJUPLzbgsSo1Dlss/jbqVzyCNzSxLZJMIPJq3XzYtOLTz8NQ10uSNd 59SrxTAq0e4BDQzRaUgaCVtlHS6Ziv9mmIjbSzalrBHuxybGnqH1Nr/IXFAqnDf0puDa 4GNZRNreIvtjHoHyDO7cc9vp5t4iRNpYdjr+mK2ihySJoyf6QEsrVd0raD70rfSwfOXR 1SPQ== X-Gm-Message-State: AFqh2krgBN6OhfBvO57A6rwvocC402G/J2QcjU/CYrXk2OPZvMcR+z3D RHUusdSC5NbsZs+l9V2mFIE= X-Received: by 2002:a17:906:2857:b0:7c0:a4b5:babf with SMTP id s23-20020a170906285700b007c0a4b5babfmr16745747ejc.3.1673813998434; Sun, 15 Jan 2023 12:19:58 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id k2-20020a170906970200b0073dbaeb50f6sm10863061ejx.169.2023.01.15.12.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:19:57 -0800 (PST) Date: Sun, 15 Jan 2023 21:19:56 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Rename bLastDTPFlag_Low, OFDM_index and CCK_index Message-ID: <1058b8be954b634f5c2cd9d4a46c33dbbe9459c5.1673812849.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121230088999141?= X-GMAIL-MSGID: =?utf-8?q?1755121230088999141?= Rename variable bLastDTPFlag_Low to last_dtp_flag_low, OFDM_index to ofdm_index and CCK_index to cck_index to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 52 +++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 2e9932a26382..7ba60d93b9b3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1074,11 +1074,11 @@ static void _rtl92e_cck_tx_power_track_bw_switch_thermal(struct net_device *dev) case HT_CHANNEL_WIDTH_20: if (priv->Record_CCK_20Mindex == 0) priv->Record_CCK_20Mindex = 6; - priv->CCK_index = priv->Record_CCK_20Mindex; + priv->cck_index = priv->Record_CCK_20Mindex; break; case HT_CHANNEL_WIDTH_20_40: - priv->CCK_index = priv->Record_CCK_40Mindex; + priv->cck_index = priv->Record_CCK_40Mindex; 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 1f8bfe83b8ef..fea5f547b7be 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -483,7 +483,7 @@ struct r8192_priv { bool dynamic_tx_high_pwr; bool dynamic_tx_low_pwr; bool last_dtp_flag_high; - bool bLastDTPFlag_Low; + bool last_dtp_flag_low; u8 rfa_txpowertrackingindex; u8 rfa_txpowertrackingindex_real; @@ -496,8 +496,8 @@ struct r8192_priv { u8 txpower_count; bool btxpower_trackingInit; - u8 OFDM_index[2]; - u8 CCK_index; + u8 ofdm_index[2]; + u8 cck_index; u8 Record_CCK_20Mindex; u8 Record_CCK_40Mindex; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 09ea3a6f373c..f03b479a9143 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -775,13 +775,13 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev) bMaskDWord); for (i = 0; i < OFDM_Table_Length; i++) { if (tmpRegA == OFDMSwingTable[i]) - priv->OFDM_index[0] = i; + priv->ofdm_index[0] = i; } TempCCk = rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2); for (i = 0; i < CCK_Table_length; i++) { if (TempCCk == (u32)CCKSwingTable_Ch1_Ch13[i][0]) { - priv->CCK_index = i; + priv->cck_index = i; break; } } @@ -836,17 +836,17 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev) CCKSwingNeedUpdate = 1; } - if (priv->CCK_index != tmpCCKindex) { - priv->CCK_index = tmpCCKindex; + if (priv->cck_index != tmpCCKindex) { + priv->cck_index = tmpCCKindex; CCKSwingNeedUpdate = 1; } if (CCKSwingNeedUpdate) rtl92e_dm_cck_txpower_adjust(dev, priv->bcck_in_ch14); - if (priv->OFDM_index[0] != tmpOFDMindex) { - priv->OFDM_index[0] = tmpOFDMindex; + if (priv->ofdm_index[0] != tmpOFDMindex) { + priv->ofdm_index[0] = tmpOFDMindex; rtl92e_set_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord, - OFDMSwingTable[priv->OFDM_index[0]]); + OFDMSwingTable[priv->ofdm_index[0]]); } priv->txpower_count = 0; } @@ -1005,30 +1005,30 @@ static void _rtl92e_dm_cck_tx_power_adjust_thermal_meter(struct net_device *dev, TempVal = 0; if (!bInCH14) { - TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][0] + - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][1] << 8); + TempVal = CCKSwingTable_Ch1_Ch13[priv->cck_index][0] + + (CCKSwingTable_Ch1_Ch13[priv->cck_index][1] << 8); rtl92e_set_bb_reg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal); - TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][2] + - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][3] << 8) + - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][4] << 16)+ - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][5] << 24); + TempVal = CCKSwingTable_Ch1_Ch13[priv->cck_index][2] + + (CCKSwingTable_Ch1_Ch13[priv->cck_index][3] << 8) + + (CCKSwingTable_Ch1_Ch13[priv->cck_index][4] << 16)+ + (CCKSwingTable_Ch1_Ch13[priv->cck_index][5] << 24); rtl92e_set_bb_reg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal); - TempVal = CCKSwingTable_Ch1_Ch13[priv->CCK_index][6] + - (CCKSwingTable_Ch1_Ch13[priv->CCK_index][7] << 8); + TempVal = CCKSwingTable_Ch1_Ch13[priv->cck_index][6] + + (CCKSwingTable_Ch1_Ch13[priv->cck_index][7] << 8); rtl92e_set_bb_reg(dev, rCCK0_DebugPort, bMaskLWord, TempVal); } else { - TempVal = CCKSwingTable_Ch14[priv->CCK_index][0] + - (CCKSwingTable_Ch14[priv->CCK_index][1] << 8); + TempVal = CCKSwingTable_Ch14[priv->cck_index][0] + + (CCKSwingTable_Ch14[priv->cck_index][1] << 8); rtl92e_set_bb_reg(dev, rCCK0_TxFilter1, bMaskHWord, TempVal); - TempVal = CCKSwingTable_Ch14[priv->CCK_index][2] + - (CCKSwingTable_Ch14[priv->CCK_index][3] << 8) + - (CCKSwingTable_Ch14[priv->CCK_index][4] << 16)+ - (CCKSwingTable_Ch14[priv->CCK_index][5] << 24); + TempVal = CCKSwingTable_Ch14[priv->cck_index][2] + + (CCKSwingTable_Ch14[priv->cck_index][3] << 8) + + (CCKSwingTable_Ch14[priv->cck_index][4] << 16)+ + (CCKSwingTable_Ch14[priv->cck_index][5] << 24); rtl92e_set_bb_reg(dev, rCCK0_TxFilter2, bMaskDWord, TempVal); - TempVal = CCKSwingTable_Ch14[priv->CCK_index][6] + - (CCKSwingTable_Ch14[priv->CCK_index][7]<<8); + TempVal = CCKSwingTable_Ch14[priv->cck_index][6] + + (CCKSwingTable_Ch14[priv->cck_index][7]<<8); rtl92e_set_bb_reg(dev, rCCK0_DebugPort, bMaskLWord, TempVal); } @@ -2272,7 +2272,7 @@ static void _rtl92e_dm_init_dynamic_tx_power(struct net_device *dev) priv->rtllib->bdynamic_txpower_enable = true; priv->last_dtp_flag_high = false; - priv->bLastDTPFlag_Low = false; + priv->last_dtp_flag_low = false; priv->dynamic_tx_high_pwr = false; priv->dynamic_tx_low_pwr = false; } @@ -2316,11 +2316,11 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_device *dev) } if ((priv->dynamic_tx_high_pwr != priv->last_dtp_flag_high) || - (priv->dynamic_tx_low_pwr != priv->bLastDTPFlag_Low)) { + (priv->dynamic_tx_low_pwr != priv->last_dtp_flag_low)) { rtl92e_set_tx_power(dev, priv->rtllib->current_network.channel); } priv->last_dtp_flag_high = priv->dynamic_tx_high_pwr; - priv->bLastDTPFlag_Low = priv->dynamic_tx_low_pwr; + priv->last_dtp_flag_low = priv->dynamic_tx_low_pwr; } From patchwork Sun Jan 15 20:20:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp887813wrn; Sun, 15 Jan 2023 12:21:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXucfCoJPpHpU4KqWCKugPCS92UPQYfmAKUrfM5iVqJVI0ZfpqWb8UOxoKMyegJEpZh/+s+b X-Received: by 2002:a17:90a:2c49:b0:229:94b:50a2 with SMTP id p9-20020a17090a2c4900b00229094b50a2mr14318301pjm.4.1673814065896; Sun, 15 Jan 2023 12:21:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814065; cv=none; d=google.com; s=arc-20160816; b=dhzN2otol+HfuK9OlQE669UlWdbGOMB7cN90TGKIBQVDCT2CWHGoP3ZqkfWH/jY0qu U5FLk9PDV+W03FHe/LarLZKnr/hiQSI6dEn8UgopkfOMzMSmv249ItzcS6E1iVj/E6eb KYcPa8faX2nUitGnBHCbt9fqU95TkzoLl6T/J+CALa5ts247OqdfaoOL1GcBgnpQ2LSa uioGLcB5wpJBzdtFhfyNfrd327rDk0OkgTUba8uSHjygk8vQzho9dpYDUyCsC2ejWE0X DPRUZHDhSadDh1ygj/MdowG1fSomJBjuRwMhZsQceUA7fU/rgEWkf/uM1yGr6kLB9/EU w9uA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id my7-20020a17090b4c8700b002187b07b835si28205075pjb.52.2023.01.15.12.20.54; Sun, 15 Jan 2023 12:21:05 -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 + 99 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-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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121258210730073?= X-GMAIL-MSGID: =?utf-8?q?1755121258210730073?= 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; } From patchwork Sun Jan 15 20:20:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp887875wrn; Sun, 15 Jan 2023 12:21:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXth7c/8OVf/lbrzOrHFJLtV6Y9ltFEygp3NuX+dIRj554FgS0fOIyZAORW7/TXA2rgH7N6b X-Received: by 2002:a05:6a20:69a0:b0:b5:a64d:a181 with SMTP id t32-20020a056a2069a000b000b5a64da181mr38971077pzk.19.1673814075846; Sun, 15 Jan 2023 12:21:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814075; cv=none; d=google.com; s=arc-20160816; b=mlKvrbuhiGTZ014xQeCohZrFiAfJcLANLxuegP+jtjQV2+bt8gFLs2UMrbLx5NG9it KhjacJ92vsRD7QTR0o3LXcuDeVQ5yMnpRtVzfgXs4/D1O/Wo9UxDFFjDa0yFW6lzLIqL XK60VZAPJK6CrU3ai4rt4HZBkJ1MTTWmQO4CRE4s3gPT1ou8U1l5MBZmvk1nVtob12cR yGrc+VINspJ/ikVsLi8pDyOT59SFzLnVAQX0j+DEUl7zs/Faqei8G1X1yhKO9kv9klVM R/saLPdLp/jldoKgnvqp/F+cNgqCu674hDDo59OxdPW9v1sbflD2Fw9xTyGpedUPIyxy bfig== 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=n9PMUN06RhbNHE4qDKcXN4Xb3hE+7IHkXvclZTL5rZs=; b=ajzCZxpRTSmfGszSMSbbNluwA6qW6vgj2GDYnh4zoFL4td7bwgWnye+/TgC48tINXs lauqHoEREaGI/k9jhJnNbU+vMNbPZJpPBlVpXD2ED1BI+xw9N9jBEwVgTMcEX0uqPYNa n7xRYWsMH0wVAbGAyhfIV55AioYgPpdoMOb7ac0PBM5zW80IuWTlkuVzDL20T8bhH29D f+gebnHdTheaAzYxD1go7feZ4YA/MRLYQCsjOKiSOXnRBKTqLYZq2bVksCrfCtZo1z7V 8AG34rX6WGZFnA+E0bdH+LSLsO1CZGpmWCkz0HpWb6ZqdmrLKLuKBKcvd94buuVu2K64 9uog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UFwvfEY6; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r23-20020a63ce57000000b004c76e49e14fsi5914785pgi.161.2023.01.15.12.21.04; Sun, 15 Jan 2023 12:21:15 -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=UFwvfEY6; 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 S231555AbjAOUUZ (ORCPT + 99 others); Sun, 15 Jan 2023 15:20:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231523AbjAOUUW (ORCPT ); Sun, 15 Jan 2023 15:20:22 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 994AD12F23 for ; Sun, 15 Jan 2023 12:20:21 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id az20so44619565ejc.1 for ; Sun, 15 Jan 2023 12:20:21 -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=n9PMUN06RhbNHE4qDKcXN4Xb3hE+7IHkXvclZTL5rZs=; b=UFwvfEY6RgPL6bTmbwMM6X804QbJ95a78/+fsEiD5IN1BGpQRN7OsCxJDytCyzjwwr UaniCR6F9hseOhz3D74EkQQkron6+fHd6Fk06RT59CNiA4AoD0Ef8mlipOtkBQVu5q76 kGOTwN/hC8X2Hly5SlAwGRZRczxlB+VhJp12Iv7QHAVZ4SGi1sRnuJEjfdkLv4wdD4lG nr+NFUnlkmgKRJS/iuTdkCSuDpyBzcjt/6h/e0Ns19aRr8RWSyvt3oBJlkoGwGvlWBCv z65mRlOdhHj6dEonzrPklK8RgHXQPIM3opUOB+BIETQQeFH0OoBdhmJdmUIlme3+9Xvv +CpQ== 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=n9PMUN06RhbNHE4qDKcXN4Xb3hE+7IHkXvclZTL5rZs=; b=H99SopnVVjbtUSeqWb5rpZjE0EQjAaoPSGYHKGWEP3ERzt+LkepNj+a9tR5kxt9rZS G3NBb8uFdL5wVhcG64bXQ9nGtiMfOtVvUWGqsXw4yereANFYtrD3NYyygf8f6U4JIV/p f6uyphAIAyBww3L79GMRMEFODj9CulSl4uPAZ51cm8hG2b6kfKj02rbYBS0z/2IpzWeb hfjTeYJ0oujjS4y9iZ15eODvk0K+gE8zU1DiVj3oBmBKPljJJhOb6loZ7J/k2A3Ii/2D U7n/7FL3Kd7FfxWaWPBrhj8ImASJikFFUhOdJy2zdLwJZnoeDeUTNVWDpQXwYpuq0TWW 7b7w== X-Gm-Message-State: AFqh2kpS27Fi5HT+IwMXPv9DRthTOYE4dzaYMxhwEgIMzMo3WomlhRsH Va1WNjO+a0a8d55QyomfR7Q= X-Received: by 2002:a17:906:9c85:b0:7c0:d7af:fce3 with SMTP id fj5-20020a1709069c8500b007c0d7affce3mr16969500ejc.1.1673814020184; Sun, 15 Jan 2023 12:20:20 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id p21-20020a056402045500b0048aff8b5b70sm10601967edw.67.2023.01.15.12.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:20:19 -0800 (PST) Date: Sun, 15 Jan 2023 21:20:18 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Rename rateCountDi.., ContinueDif.. and TxCounter Message-ID: References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121268263226346?= X-GMAIL-MSGID: =?utf-8?q?1755121268263226346?= Rename variable rateCountDiffRecord to rate_count_diff_rec, ContinueDiffCount to continue_diff_count and TxCounter to tx_counter to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 26 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index ebf1fa5ec295..1f0c53dcbb2d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -2154,10 +2154,10 @@ bool rtl92e_is_tx_stuck(struct net_device *dev) bool bStuck = false; u16 RegTxCounter = rtl92e_readw(dev, 0x128); - if (priv->TxCounter == RegTxCounter) + if (priv->tx_counter == RegTxCounter) bStuck = true; - priv->TxCounter = RegTxCounter; + priv->tx_counter = RegTxCounter; return bStuck; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index af377f7c7f7b..be87bb9da6cc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -510,8 +510,8 @@ struct r8192_priv { bool bfsync_processing; u32 rate_record; - u32 rateCountDiffRecord; - u32 ContinueDiffCount; + u32 rate_count_diff_rec; + u32 continue_diff_count; bool bswitch_fsync; u8 framesync; u32 framesyncC34; @@ -520,7 +520,7 @@ struct r8192_priv { u32 reset_count; enum reset_type rst_progress; - u16 TxCounter; + u16 tx_counter; u16 rx_ctr; bool bResetInProgress; bool force_reset; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 9789cdd8ac15..2a570c28e694 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -2008,31 +2008,31 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) priv->rate_record; else rate_count_diff = rate_count - priv->rate_record; - if (rate_count_diff < priv->rateCountDiffRecord) { + if (rate_count_diff < priv->rate_count_diff_rec) { - u32 DiffNum = priv->rateCountDiffRecord - + u32 DiffNum = priv->rate_count_diff_rec - rate_count_diff; if (DiffNum >= priv->rtllib->fsync_seconddiff_ratethreshold) - priv->ContinueDiffCount++; + priv->continue_diff_count++; else - priv->ContinueDiffCount = 0; + priv->continue_diff_count = 0; - if (priv->ContinueDiffCount >= 2) { + if (priv->continue_diff_count >= 2) { bSwitchFromCountDiff = true; - priv->ContinueDiffCount = 0; + priv->continue_diff_count = 0; } } else { - priv->ContinueDiffCount = 0; + priv->continue_diff_count = 0; } if (rate_count_diff <= priv->rtllib->fsync_firstdiff_ratethreshold) { bSwitchFromCountDiff = true; - priv->ContinueDiffCount = 0; + priv->continue_diff_count = 0; } priv->rate_record = rate_count; - priv->rateCountDiffRecord = rate_count_diff; + priv->rate_count_diff_rec = rate_count_diff; if (priv->undecorated_smoothed_pwdb > priv->rtllib->fsync_rssi_threshold && bSwitchFromCountDiff) { @@ -2073,7 +2073,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) rtl92e_writeb(dev, 0xC36, 0x5c); rtl92e_writeb(dev, 0xC3e, 0x96); } - priv->ContinueDiffCount = 0; + priv->continue_diff_count = 0; rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd); } } @@ -2114,7 +2114,7 @@ static void _rtl92e_dm_end_sw_fsync(struct net_device *dev) rtl92e_writeb(dev, 0xC3e, 0x96); } - priv->ContinueDiffCount = 0; + priv->continue_diff_count = 0; rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd); } @@ -2125,8 +2125,8 @@ static void _rtl92e_dm_start_sw_fsync(struct net_device *dev) u32 rate_bitmap; priv->rate_record = 0; - priv->ContinueDiffCount = 0; - priv->rateCountDiffRecord = 0; + priv->continue_diff_count = 0; + priv->rate_count_diff_rec = 0; priv->bswitch_fsync = false; if (priv->rtllib->mode == WIRELESS_MODE_N_24G) { From patchwork Sun Jan 15 20:20:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp887929wrn; Sun, 15 Jan 2023 12:21:23 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnk/Y8shkTuKBNiuL8bTLc+Aa6DjxuDcDpBNhNP7c0n9mLLZGuClCqzKCtu6aMap5RgEq+ X-Received: by 2002:a17:903:1d0:b0:192:4f32:3ba7 with SMTP id e16-20020a17090301d000b001924f323ba7mr111977441plh.18.1673814083245; Sun, 15 Jan 2023 12:21:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814083; cv=none; d=google.com; s=arc-20160816; b=mKsjr+iO7DMOHbN4zRTGE1gSXabh5Q1vgKL00a32CMQfTitfiKOZ6OzEWiMw02/4Tw g4oHC1LjXAesCc5r7n/AtiG8V0/Cviotqd3aH2fIyZSUfnvS/DSMpHElIKs66DSicW6i b9aUQymIS8pMcFI7JGLFtKjshQ5QAKbTV2IOMPt/f1pVfjMOnxtWAlVZrbkGelkWKcjd YIF1bdcMfjw4hCY6gqkUa1Q8ZUjHDBfBqdrAiidCaTAIJ3aqb/kpLYFD7ZbhSoGJuTv8 iIEEjjupnHPpOzxlTpeQAD3umUv3w9QbFBYqBgp61HxJBq4u8xjqts4l0U0fXfKxYm1N scBQ== 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=ouM6QWYCZ5t51yksCPB1b6uNMFDiFA56prLXy+81mDY=; b=rxpeqiTLTkESqO3FfVAWdjjFBg9twPaMbS+OE1iZkUctXgMkmTZwxjGjEAkZKlSxwj AwGETVuh5G0VnEL9ty7MPNHqXpHF9XXQg2q31dlZc+JjTFax7rCVDAeM9sL7p8wzobDZ MoQK3cnjd4hepzTjwwNnAcXWOtt9Cf0sCWmK1pAEDO5z/06uKBha0HX9VvxiTNDwaq++ bImEkBmToeAA+S1riLX97phkMd0Jr7tQaf0nIlYiDInyMycnqx5bOUGYzqdvKU2fAdNR zGMdl+6mxTZd28YEd3J+GTWu0YP3KJ2R1G4PSsL11DtXL0srdeLEN1wLVDrM+HpSkPeg 8UPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=bz6qdByB; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j6-20020a170903024600b001930df8e0cesi29552024plh.296.2023.01.15.12.21.11; Sun, 15 Jan 2023 12:21:23 -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=bz6qdByB; 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 S231576AbjAOUUv (ORCPT + 99 others); Sun, 15 Jan 2023 15:20:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231578AbjAOUUm (ORCPT ); Sun, 15 Jan 2023 15:20:42 -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 A771A13535 for ; Sun, 15 Jan 2023 12:20:35 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id mp20so17108254ejc.7 for ; Sun, 15 Jan 2023 12:20:35 -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=ouM6QWYCZ5t51yksCPB1b6uNMFDiFA56prLXy+81mDY=; b=bz6qdByBJl4nrO56DtSFjRI5uHjLdjelXPwGBGlHPjJmBh1aGpLSZX50gurAfGgDlp mnXToDbbWKk0hpSaKT3U5Xwr25/ZsvlxnFFDtnVQcwjkFFNh/Z/Pkb/C/vbl0HSy0lx+ Wlma522NjSsjL7WIupl891Lx7dPE9G0M1mvMTW3Z0/OK7NJs4/Jco5mkOjrqw97ikOje w3xbZFQ6lMGHvaQZKY5GHOkH/cZ3q1VRWXfdzmO7r4+G4+oISFvk8U2bHwYrOhx5nhlW agqtKvIB2x4HT5uNVS5mJ0WuHjt0/IExwV1csfolLAr4ArcshcHfYZRtXd/kzTZbvETD ymMw== 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=ouM6QWYCZ5t51yksCPB1b6uNMFDiFA56prLXy+81mDY=; b=n82gPFvj3C8uWmKbmsbFvvjeBS+B3FNF+hz3zocXw/WxGNPH61KWGjoudVLS3ZR8f6 is43y+jnCLuW690S27lCsjDLOzMUOIQRrqEda4cyv4bG+7UPK8+TVVtljGq3no/a30JX Y6s0tRtqzh2q+q1mO+SDIkjMrAP4eU5sKplnCIJWQLnUdRQlYx5C6cnDWK9+1aRBe3rI Pkv+Sbu1vEkMdI+tVF+13IxwA95iO3M+x6KUY/HzrS0oANPXasW2gaUUop+2hCC3HNMh yVBh8ulN6qHbIZrtHUfE1Lends8rmdawgFybNBHQvMHtsepIVJfBblIGw9pRwITOddTK +X7g== X-Gm-Message-State: AFqh2kofILg8dO3CPi9zXZK4qjjYgLh1zmgDZztLSKviVp223njev1fh AQm7Gdd9wALHowfzbo7bfBg= X-Received: by 2002:a17:906:7255:b0:86e:2051:a514 with SMTP id n21-20020a170906725500b0086e2051a514mr1257362ejk.5.1673814034198; Sun, 15 Jan 2023 12:20:34 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id 14-20020a170906308e00b0084d3acda5fasm9475529ejv.189.2023.01.15.12.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:20:33 -0800 (PST) Date: Sun, 15 Jan 2023 21:20:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Rename bResetInPro.., framesyncMo.. and nCur40MhzPri.. Message-ID: References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121276155769810?= X-GMAIL-MSGID: =?utf-8?q?1755121276155769810?= Rename variable bResetInProgress to reset_in_progress, framesyncMonitor to frame_sync_monitor and nCur40MhzPrimeSC to n_cur_40mhz_prime_sc to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1f0c53dcbb2d..734a097ee268 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1074,7 +1074,7 @@ void rtl92e_fill_tx_desc(struct net_device *dev, struct tx_desc *pdesc, pTxFwInfo->TxSubCarrier = 0; } else { pTxFwInfo->TxBandwidth = 0; - pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC; + pTxFwInfo->TxSubCarrier = priv->n_cur_40mhz_prime_sc; } } else { pTxFwInfo->TxBandwidth = 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index a0233281ad94..59b2e8385ef7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1156,9 +1156,9 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) } rtl92e_set_bb_reg(dev, rCCK0_System, bCCKSideBand, - (priv->nCur40MhzPrimeSC>>1)); + (priv->n_cur_40mhz_prime_sc>>1)); rtl92e_set_bb_reg(dev, rOFDM1_LSTF, 0xC00, - priv->nCur40MhzPrimeSC); + priv->n_cur_40mhz_prime_sc); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x00100000, 0); break; @@ -1208,11 +1208,11 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, priv->CurrentChannelBW = bandwidth; if (Offset == HT_EXTCHNL_OFFSET_LOWER) - priv->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_UPPER; + priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_UPPER; else if (Offset == HT_EXTCHNL_OFFSET_UPPER) - priv->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_LOWER; + priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_LOWER; else - priv->nCur40MhzPrimeSC = HAL_PRIME_CHNL_OFFSET_DONT_CARE; + priv->n_cur_40mhz_prime_sc = HAL_PRIME_CHNL_OFFSET_DONT_CARE; _rtl92e_set_bw_mode_work_item(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 050f0435ab6d..8e1180b75d38 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1138,7 +1138,7 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) goto END; } priv->rf_change_in_progress = true; - priv->bResetInProgress = true; + priv->reset_in_progress = true; spin_unlock_irqrestore(&priv->rf_ps_lock, flag); RESET_START: @@ -1229,7 +1229,7 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) END: priv->rst_progress = RESET_TYPE_NORESET; priv->reset_count++; - priv->bResetInProgress = false; + priv->reset_in_progress = false; rtl92e_writeb(dev, UFWP, 1); } @@ -1397,7 +1397,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) if ((priv->force_reset || ResetType == RESET_TYPE_SILENT)) _rtl92e_if_silent_reset(dev); priv->force_reset = false; - priv->bResetInProgress = false; + priv->reset_in_progress = false; } static void _rtl92e_watchdog_timer_cb(struct timer_list *t) @@ -1486,7 +1486,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, u8 queue_index = tcb_desc->queue_index; if ((priv->rtllib->rf_power_state == rf_off) || !priv->up || - priv->bResetInProgress) { + priv->reset_in_progress) { kfree_skb(skb); return; } @@ -1519,7 +1519,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (queue_index != TXCMD_QUEUE) { if ((priv->rtllib->rf_power_state == rf_off) || - !priv->up || priv->bResetInProgress) { + !priv->up || priv->reset_in_progress) { kfree_skb(skb); return 0; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index be87bb9da6cc..ed9ddb2f987b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -442,7 +442,7 @@ struct r8192_priv { u8 SwChnlStep; u8 SetBWModeInProgress; - u8 nCur40MhzPrimeSC; + u8 n_cur_40mhz_prime_sc; u32 rf_reg_0value[4]; u8 num_total_rf_path; @@ -515,14 +515,14 @@ struct r8192_priv { bool bswitch_fsync; u8 framesync; u32 framesyncC34; - u8 framesyncMonitor; + u8 frame_sync_monitor; u32 reset_count; enum reset_type rst_progress; u16 tx_counter; u16 rx_ctr; - bool bResetInProgress; + bool reset_in_progress; bool force_reset; bool force_lps; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 2a570c28e694..0e278b872470 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -640,7 +640,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(struct net_device *dev) if (Pwr_Flag == 0) { mdelay(1); - if (priv->bResetInProgress) { + if (priv->reset_in_progress) { rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); return; @@ -1969,7 +1969,7 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev) priv->rtllib->fsync_firstdiff_ratethreshold = 100; priv->rtllib->fsync_seconddiff_ratethreshold = 200; priv->rtllib->fsync_state = Default_Fsync; - priv->framesyncMonitor = 1; + priv->frame_sync_monitor = 1; timer_setup(&priv->fsync_timer, _rtl92e_dm_fsync_timer_callback, 0); } @@ -2196,7 +2196,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) } } - if (priv->framesyncMonitor) { + if (priv->frame_sync_monitor) { if (reg_c38_State != RegC38_Fsync_AP_BCM) { rtl92e_writeb(dev, rOFDM0_RxDetector3, 0x95); @@ -2218,7 +2218,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) break; } - if (priv->framesyncMonitor) { + if (priv->frame_sync_monitor) { if (priv->rtllib->state == RTLLIB_LINKED) { if (priv->undecorated_smoothed_pwdb <= RegC38_TH) { @@ -2249,7 +2249,7 @@ static void _rtl92e_dm_check_fsync(struct net_device *dev) } } } - if (priv->framesyncMonitor) { + if (priv->frame_sync_monitor) { if (priv->reset_count != reset_cnt) { rtl92e_writeb(dev, rOFDM0_RxDetector3, priv->framesync); From patchwork Sun Jan 15 20:20:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43891 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp888072wrn; Sun, 15 Jan 2023 12:21:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXta07a6dV/thxh+7wRKSRF3VJPRDiRv9ruBoKkJ34eWXCxr1k/Ykn0LmbfuYBprrzGfE/cl X-Received: by 2002:a17:90b:4c4d:b0:229:6f70:7a68 with SMTP id np13-20020a17090b4c4d00b002296f707a68mr2100820pjb.33.1673814109743; Sun, 15 Jan 2023 12:21:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814109; cv=none; d=google.com; s=arc-20160816; b=p+WnFgqWc35AnyLVKfB4TeRKxjtafRmbJTMWF0upsfXBNTouLOsgMFD8hw/ezYohD+ bGJ8QasZmIMj3L/HJIYfmy8uDHorS/yxYFPnnWdoNXo9xIrQCUH8JJB0pTp5I1rRIida SEAgyBT2Xd/bnw9t3opF1x1BfAUfgvbErzyDmkhC9PT/dW8BioIqvI13vi4lVPJePywi iK4SSO7VzxuaFRx8a5UdHu88z8c7bHV8iE3SSc4QyCu/G2FXz43IXb8vjlG9e0RDRIxz QEGwIpNilOlLTyiv4WmgI6hwYrVwPvkRnRN/LBl+aR8SR9TdJPR3/1IG8cT8G1UDQ9A3 hLNg== 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=mMkhVziKXAjeT1z9GbTnob0aeQTSn+K+39faEGee5Co=; b=boIS0p/MFlgVcbDgYtJiVVACHRtWgO3YtBf5dGavFCVpNMCi8UUABYkTZMPE0SxuIo gVwQrXqe9ZW41ElQkb7bO2EO4NEg/YmPNReJTILzXF2384AXWwt/lWmxmCjw/pcprH9C haGsHK6dTlBNPeoJ5eJ5k/lEk6TN62POxq8DgCp63qYMc1m0wrmIBJg4JKhFN2Fnligq bS3jyS7aYnpNe3Y7hbTKlMY3rThsdaa2nV3zJHf6wwbLByUAaEvKIBJ6KCfRAvuhsM1T u1BJ7QHGPeKu2ttj/hQqN4qDHoui4YVCetiTW2kaqW2w0yF4ZJ4FoIGU8/9Cnp2bKX3f k2VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Le7lD0qm; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n11-20020a17090a73cb00b0022612a5d2e2si28530376pjk.123.2023.01.15.12.21.37; Sun, 15 Jan 2023 12:21:49 -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=Le7lD0qm; 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 S231549AbjAOUU5 (ORCPT + 99 others); Sun, 15 Jan 2023 15:20:57 -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-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: 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121304115720226?= X-GMAIL-MSGID: =?utf-8?q?1755121304115720226?= 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/staging/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] = (priv->EEPROMAntPwDiff & 0xf00) >> 8; priv->CrystalCap = priv->EEPROMCrystalCap; - priv->ThermalMeter[0] = priv->EEPROMThermalMeter & 0xf; - priv->ThermalMeter[1] = (priv->EEPROMThermalMeter & + priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; + priv->thermal_meter[1] = (priv->EEPROMThermalMeter & 0xf0) >> 4; } else if (priv->epromtype == EEPROM_93C56) { @@ -462,8 +462,8 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[2] = 0; priv->CrystalCap = priv->EEPROMCrystalCap; - priv->ThermalMeter[0] = priv->EEPROMThermalMeter & 0xf; - priv->ThermalMeter[1] = (priv->EEPROMThermalMeter & + priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; + priv->thermal_meter[1] = (priv->EEPROMThermalMeter & 0xf0) >> 4; } } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/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 channel) netdev_err(dev, "%s(): Driver is not initialized\n", __func__); return false; } - if (priv->SwChnlInProgress) + if (priv->sw_chnl_in_progress) return false; @@ -987,7 +987,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel) break; } - priv->SwChnlInProgress = true; + priv->sw_chnl_in_progress = true; if (channel == 0) channel = 1; @@ -998,7 +998,7 @@ u8 rtl92e_set_channel(struct net_device *dev, u8 channel) if (priv->up) _rtl92e_phy_switch_channel_work_item(dev); - priv->SwChnlInProgress = false; + priv->sw_chnl_in_progress = false; return true; } @@ -1101,7 +1101,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) u8 regBwOpMode; if (priv->rf_chip == RF_PSEUDO_11N) { - priv->SetBWModeInProgress = false; + priv->set_bw_mode_in_progress = false; return; } if (!priv->up) { @@ -1190,7 +1190,7 @@ static void _rtl92e_set_bw_mode_work_item(struct net_device *dev) } atomic_dec(&(priv->rtllib->atm_swbw)); - priv->SetBWModeInProgress = false; + priv->set_bw_mode_in_progress = false; } void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, @@ -1199,11 +1199,11 @@ void rtl92e_set_bw_mode(struct net_device *dev, enum ht_channel_width bandwidth, struct r8192_priv *priv = rtllib_priv(dev); - if (priv->SetBWModeInProgress) + if (priv->set_bw_mode_in_progress) return; atomic_inc(&(priv->rtllib->atm_swbw)); - priv->SetBWModeInProgress = true; + priv->set_bw_mode_in_progress = true; priv->CurrentChannelBW = bandwidth; 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; u8 CrystalCap; - u8 ThermalMeter[2]; + u8 thermal_meter[2]; - u8 SwChnlInProgress; + u8 sw_chnl_in_progress; u8 SwChnlStage; u8 SwChnlStep; - u8 SetBWModeInProgress; + u8 set_bw_mode_in_progress; u8 n_cur_40mhz_prime_sc; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/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(struct net_device *dev) return; if (tmpRegA >= 12) tmpRegA = 12; - priv->ThermalMeter[0] = ThermalMeterVal; - priv->ThermalMeter[1] = ThermalMeterVal; + priv->thermal_meter[0] = ThermalMeterVal; + priv->thermal_meter[1] = ThermalMeterVal; - if (priv->ThermalMeter[0] >= (u8)tmpRegA) { - tmpOFDMindex = tmpCCK20Mindex = 6+(priv->ThermalMeter[0] - + if (priv->thermal_meter[0] >= (u8)tmpRegA) { + tmpOFDMindex = tmpCCK20Mindex = 6+(priv->thermal_meter[0] - (u8)tmpRegA); tmpCCK40Mindex = tmpCCK20Mindex - 6; if (tmpOFDMindex >= OFDM_Table_Length) @@ -808,7 +808,7 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(struct net_device *dev) if (tmpCCK40Mindex >= CCK_Table_length) tmpCCK40Mindex = CCK_Table_length-1; } else { - tmpval = (u8)tmpRegA - priv->ThermalMeter[0]; + tmpval = (u8)tmpRegA - priv->thermal_meter[0]; if (tmpval >= 6) { tmpOFDMindex = 0; tmpCCK20Mindex = 0; From patchwork Sun Jan 15 20:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp888192wrn; Sun, 15 Jan 2023 12:22:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXtjdN0xPOGj1T33bY3zv40TH7SunE8spmSiDxqDxSAq7OS7Paz8qbCe5p62k3ZN/UDMzcz/ X-Received: by 2002:a17:90a:7e8d:b0:227:c69:3ca7 with SMTP id j13-20020a17090a7e8d00b002270c693ca7mr27884411pjl.10.1673814130656; Sun, 15 Jan 2023 12:22:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814130; cv=none; d=google.com; s=arc-20160816; b=msJbzWQG0jH+lpGQHa5ugi+9FNXJMypr35pbWbcXbUcToTe8gmGy/oQ9S1JGzLZf31 PZb/NJYti/uiswfQw2okwi7uvpOosWg87l2ixLFo99x1M8IcQ/eIP7lygjkRlksy+4kR h8idH8OtFFzcPeZsPAKb8MSBiVviv2dydtskFn/XaDfBxNPZ8seStB2C+kFoS3I0l58l 7GW4Jzez8RJQDr7M3Q8JVQfdnHBPQP7+szQNznsfdiEKkbR5jc5Ak48Atbtd10dbUjaK +E85mq9X/snFrc8ag8nfhI31HMMB7HNUybzZwtSjvejc5u46hOd3xEu0OgoPlT382j1q cDbg== 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=C3D8UAIpPdh0OnnneROpH+4kQYTJrI2bK2LOL7v5ysU=; b=MQ+OZhWnkhK1krOmGdkp4WWMRojr95o1mtUcg3UgQk7vW9z1DPTuvsAB/sgwPlkyRD 909gYVG6KAJHftaB8dVVFb5QNAa/eRmkMaD/bKJuI51V92YpUvs8HqWj7SYxHP9FGIf3 66uYeG92WrYvH8ksmKh8PfpM1ISVr8w4cX35tDsNIslLgpjUf+urx9cdtqLnZlKg+Pns uHzaFilTnAD5dzSez/JCFwoS+SizQKYPitk1r6WgR5TJgocjDneIooHZ0Nk6GOUOPQJZ 6TM42THAaYchKLtaea/U+V63RcpZOacoTVjeN3i0NXG/32VdcTZ2EF4B6CfMWNbubrLg /XQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=aiV7jbke; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q60-20020a17090a4fc200b00202eab3e1b5si29963768pjh.10.2023.01.15.12.21.58; Sun, 15 Jan 2023 12:22:10 -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=aiV7jbke; 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 S231605AbjAOUVD (ORCPT + 99 others); Sun, 15 Jan 2023 15:21:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbjAOUUx (ORCPT ); Sun, 15 Jan 2023 15:20:53 -0500 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7EB5512F30 for ; Sun, 15 Jan 2023 12:20:52 -0800 (PST) Received: by mail-ej1-x634.google.com with SMTP id ud5so63738374ejc.4 for ; Sun, 15 Jan 2023 12:20:52 -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=C3D8UAIpPdh0OnnneROpH+4kQYTJrI2bK2LOL7v5ysU=; b=aiV7jbke00Xwy3+nc4Ypx6fdmK1d7XS+jTfHdfkjIPxwsC+IRsIwmtugjczEzbPknh WYXi9qKISR2FGWSqw3GlrkithkJ7cMN4Cl2yJ6Hf4kB06Z0Fs8gNyKKzxI42Oky8XidG oN8oxl+AfaFAHF1GXMQzfSBRGIBlQrWSyNNHRUmnCXunExrvlrW/DHiEFM1QdUiitH7j sF1c4nBFRLVLH0yAl5ETTscXf0FjeqxjWxWs3F36r+VOEFPAR68SWusV/oXDx+OYZgWz 7sMjHsHu/DC9tA/aHyOgkahB1YmpmMn0Jjfo2Il+Hwzh11TyEaKNCsVlmLx4WsgciNJO w4hg== 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=C3D8UAIpPdh0OnnneROpH+4kQYTJrI2bK2LOL7v5ysU=; b=tULNrSnb9skf9odGo6TRRH2f5wRH1l0s/SFyoYi8cH8UugbHumuGZTvGp1aeWcDee7 /oXO/plXhGZG4MD9/bek8L7GLDu0AXJRseL4/i+QMw6EL96j/bCKVG+Yaw4437MMiXww x8UGjmwySKcfyvqjFjZrN4VrU36+nkcmjVumif7qavL8BBgRjKi/U4ZWkElgeQOob8We mOfn1Joo/nwSTn0E/i/2V8a67ykDylDfnniZ1R5I4a3w8Pj8oE+w+JJcs+7yFlmB8i4S 26s+EponmtDwVE33Q2VWe2SN41ueMH1Vgh/gMC8s0I77gm6TZt09UhE2D4jgOKBOzZWE Dcfw== X-Gm-Message-State: AFqh2kqe3kXKEQVQIQ1rr+BLCGqfqKhqOtuWrJRYeDkCLoSJcouC40GE rfxa2RsX68l/od7HpPNHm9E= X-Received: by 2002:a17:906:ccc1:b0:7c1:81d2:1e55 with SMTP id ot1-20020a170906ccc100b007c181d21e55mr20036293ejb.6.1673814051055; Sun, 15 Jan 2023 12:20:51 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id lb14-20020a170907784e00b007c0fd177c0bsm10864347ejc.46.2023.01.15.12.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:20:50 -0800 (PST) Date: Sun, 15 Jan 2023 21:20:48 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Rename CrystalCap, EEPROMLegacyHTT.. and EEPROMCrys.. Message-ID: <16337153218e9d1e25f90ca17774d1246086f1a7.1673812849.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121325565266169?= X-GMAIL-MSGID: =?utf-8?q?1755121325565266169?= Rename variable CrystalCap to crystal_cap, EEPROMLegacyHTTxPowerDiff to eeprom_legacy_ht_tx_pwr_diff and EEPROMCrystalCap to eeprom_crystal_cap to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 1499e6b2fa39..df8cdea5ee95 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -355,14 +355,14 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) if (!priv->AutoloadFailFlag) { tempval = (rtl92e_eeprom_read(dev, (EEPROM_RFInd_PowerDiff >> 1))) & 0xff; - priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf; + priv->eeprom_legacy_ht_tx_pwr_diff = tempval & 0xf; if (tempval&0x80) priv->rf_type = RF_1T2R; else priv->rf_type = RF_2T4R; } else { - priv->EEPROMLegacyHTTxPowerDiff = 0x04; + priv->eeprom_legacy_ht_tx_pwr_diff = 0x04; } if (!priv->AutoloadFailFlag) @@ -378,12 +378,12 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) usValue = rtl92e_eeprom_read(dev, EEPROM_TxPwDiff_CrystalCap >> 1); priv->EEPROMAntPwDiff = usValue & 0x0fff; - priv->EEPROMCrystalCap = (usValue & 0xf000) + priv->eeprom_crystal_cap = (usValue & 0xf000) >> 12; } else { priv->EEPROMAntPwDiff = EEPROM_Default_AntTxPowerDiff; - priv->EEPROMCrystalCap = + priv->eeprom_crystal_cap = EEPROM_Default_TxPwDiff_CrystalCap; } @@ -414,13 +414,13 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->EEPROMTxPowerLevelOFDM24G[i]; } priv->legacy_ht_tx_pwr_diff = - priv->EEPROMLegacyHTTxPowerDiff; + priv->eeprom_legacy_ht_tx_pwr_diff; priv->antenna_tx_pwr_diff[0] = priv->EEPROMAntPwDiff & 0xf; priv->antenna_tx_pwr_diff[1] = (priv->EEPROMAntPwDiff & 0xf0) >> 4; priv->antenna_tx_pwr_diff[2] = (priv->EEPROMAntPwDiff & 0xf00) >> 8; - priv->CrystalCap = priv->EEPROMCrystalCap; + priv->crystal_cap = priv->eeprom_crystal_cap; priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; priv->thermal_meter[1] = (priv->EEPROMThermalMeter & 0xf0) >> 4; @@ -457,11 +457,11 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->EEPROMRfCOfdmChnlTxPwLevel[2]; } priv->legacy_ht_tx_pwr_diff = - priv->EEPROMLegacyHTTxPowerDiff; + priv->eeprom_legacy_ht_tx_pwr_diff; priv->antenna_tx_pwr_diff[0] = 0; priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[2] = 0; - priv->CrystalCap = priv->EEPROMCrystalCap; + priv->crystal_cap = priv->eeprom_crystal_cap; priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; priv->thermal_meter[1] = (priv->EEPROMThermalMeter & 0xf0) >> 4; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 2af6763707d0..6da76ea16ff1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -544,7 +544,7 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev) (bXBTxAGC|bXCTxAGC|bXDTxAGC), dwRegValue); - dwRegValue = priv->CrystalCap; + dwRegValue = priv->crystal_cap; rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, bXtalCap92x, dwRegValue); } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index edc02a61a92d..4a2b4f01507e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -430,11 +430,11 @@ struct r8192_priv { u8 EEPROMRfCOfdmChnlTxPwLevel[3]; u16 EEPROMAntPwDiff; u8 EEPROMThermalMeter; - u8 EEPROMCrystalCap; + u8 eeprom_crystal_cap; - u8 EEPROMLegacyHTTxPowerDiff; + u8 eeprom_legacy_ht_tx_pwr_diff; - u8 CrystalCap; + u8 crystal_cap; u8 thermal_meter[2]; u8 sw_chnl_in_progress; From patchwork Sun Jan 15 20:20:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43893 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp888287wrn; Sun, 15 Jan 2023 12:22:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXtT6h49ooP4tb3IQtq3C4YCPg1jtByH9hVoc1YPY+hwj0Ey90r2RbNaK8akNKFYoePURd8Q X-Received: by 2002:aa7:8241:0:b0:58b:a4bd:e82d with SMTP id e1-20020aa78241000000b0058ba4bde82dmr14823580pfn.26.1673814149561; Sun, 15 Jan 2023 12:22:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814149; cv=none; d=google.com; s=arc-20160816; b=j7H2p4lIwZSVXRZkXMqjQQv0XK7okJVk/+JTROQe4+uZ0UvphEOA8V9Al4CyvzIR9P WJTgpOIocGoJKVd9aJMij8GE1k/oz7Ig/jBFMmip2jmG88qRcDHPGEbh5nlqAw6cfLB1 TXET+UcLj1c7qYgTEFKSy8DsyE4fnbpHGexlNPcfwcqLw70YczDYHrzM3LVaFgBhor1i NjCYQ7iHtq/Jy1d15Xmdy1QMLzCryGCSx+wGHAaqBt7mYIgeoLQsN8zYgf4yvo5k//SS +GrfFWahqA61Hb9eXrHe7bGYwv8DA3koN//+oFaSz2on6ByXcWmqEgFbO517ATyvcVKb VWvQ== 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=DrcHpDAznuQD/6gaEXJ1kSYqjTyGuN9vC1MPEK+KavU=; b=gnfbkQWJb0YHuKh5V4nPEa2P5+8lPkNs2r2mkghih+ivw57S4bMDt0uGSfR5jMjAUs mP7mdx2vBuZVJoc9Pt7uFhJyqMQ+jWnc/4U35j/EIJOE8hAOm25Y1Klj+HlOrA1Swjy8 1ntSM4J8INR+6oxg8iXF21jLWIaGA64YXj41pINjhmHELyjHfQg7uqaJMY/Tlb2rEyjX Coimfj/IfXasPelSyS+5e5oiLcE4VOZZpD91vu9e14Bbe8bn7MASgWIe1ueIU+kOXdbY LnARG13jTFzVfkrP93+nncG7vE0DroodF4OIBDffNnCSwUBWjrBW3k98AGeexmJXd1dl EakQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=HCBHzCmy; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i18-20020aa78d92000000b0058859205daesi20338229pfr.257.2023.01.15.12.22.17; Sun, 15 Jan 2023 12:22:29 -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=HCBHzCmy; 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 S231561AbjAOUVK (ORCPT + 99 others); Sun, 15 Jan 2023 15:21:10 -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-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: 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755121345757869738?= X-GMAIL-MSGID: =?utf-8?q?1755121345757869738?= 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/staging/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_device *dev) } if (!priv->AutoloadFailFlag) - priv->EEPROMThermalMeter = ((rtl92e_eeprom_read(dev, + priv->eeprom_thermal_meter = ((rtl92e_eeprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00) >> 8; else - priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter; - priv->tssi_13dBm = priv->EEPROMThermalMeter * 100; + priv->eeprom_thermal_meter = EEPROM_Default_ThermalMeter; + priv->tssi_13dBm = priv->eeprom_thermal_meter * 100; if (priv->epromtype == EEPROM_93C46) { if (!priv->AutoloadFailFlag) { usValue = rtl92e_eeprom_read(dev, EEPROM_TxPwDiff_CrystalCap >> 1); - priv->EEPROMAntPwDiff = usValue & 0x0fff; + priv->eeprom_ant_pwr_diff = usValue & 0x0fff; priv->eeprom_crystal_cap = (usValue & 0xf000) >> 12; } else { - priv->EEPROMAntPwDiff = + priv->eeprom_ant_pwr_diff = EEPROM_Default_AntTxPowerDiff; priv->eeprom_crystal_cap = 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 = EEPROM_Default_TxPower; - *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i])) + *((u16 *)(&priv->eeprom_tx_pwr_level_ofdm24g[i])) = usValue; } } @@ -411,18 +411,18 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->tx_pwr_level_cck[i] = priv->EEPROMTxPowerLevelCCK[i]; priv->tx_pwr_level_ofdm_24g[i] = - priv->EEPROMTxPowerLevelOFDM24G[i]; + priv->eeprom_tx_pwr_level_ofdm24g[i]; } priv->legacy_ht_tx_pwr_diff = priv->eeprom_legacy_ht_tx_pwr_diff; - priv->antenna_tx_pwr_diff[0] = priv->EEPROMAntPwDiff & 0xf; - priv->antenna_tx_pwr_diff[1] = (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[0] = priv->eeprom_ant_pwr_diff & 0xf; + priv->antenna_tx_pwr_diff[1] = (priv->eeprom_ant_pwr_diff & 0xf0) >> 4; - priv->antenna_tx_pwr_diff[2] = (priv->EEPROMAntPwDiff & + priv->antenna_tx_pwr_diff[2] = (priv->eeprom_ant_pwr_diff & 0xf00) >> 8; priv->crystal_cap = priv->eeprom_crystal_cap; - priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; - priv->thermal_meter[1] = (priv->EEPROMThermalMeter & + priv->thermal_meter[0] = priv->eeprom_thermal_meter & 0xf; + priv->thermal_meter[1] = (priv->eeprom_thermal_meter & 0xf0) >> 4; } else if (priv->epromtype == EEPROM_93C56) { @@ -462,8 +462,8 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->antenna_tx_pwr_diff[1] = 0; priv->antenna_tx_pwr_diff[2] = 0; priv->crystal_cap = priv->eeprom_crystal_cap; - priv->thermal_meter[0] = priv->EEPROMThermalMeter & 0xf; - priv->thermal_meter[1] = (priv->EEPROMThermalMeter & + priv->thermal_meter[0] = priv->eeprom_thermal_meter & 0xf; + priv->thermal_meter[1] = (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; 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; u8 eeprom_legacy_ht_tx_pwr_diff; From patchwork Sun Jan 15 20:21:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43895 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp893133wrn; Sun, 15 Jan 2023 12:40:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXvTsBmLhbvLHg5EG9wkZ6+a9m9QPvetCnjsQRzOZDbCKV1SdCSnCXxOW8cKPdL2RKjhvRyw X-Received: by 2002:a05:6a20:4393:b0:b8:78dd:5fb1 with SMTP id i19-20020a056a20439300b000b878dd5fb1mr2196981pzl.39.1673815216327; Sun, 15 Jan 2023 12:40:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673815216; cv=none; d=google.com; s=arc-20160816; b=tCqIObOBxz0UqUXq6sCCmUGQ3dSguKC9ICIq8L6XFDRT2s8tAqANzNL5mEIFIrpkOg fWTxIv+zMmd/5zc08+LhNaRUPJKz1slRwNgKiiQhGmUS3VJnR7kJCw8JToCejoNJl1v7 kcblaZEybYB/ubegxmo8NAq8WCKNu0esoD3ubFBzFGOJkGrRAJFSRHDrjHWgEzHYOBgt 85T2DPhgY/YCKpPPOBeoTXAjCI9Szi17+isbu6POOPs4BOsFyH6pvlkRpPFAWLr+fRde GQrjQq3ODSmVpQxe/bdEgpZQkDzPOCKKW/6cnz7ustRD17MURpICE0ZvLft8Z2A+u6vy R6ww== 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=zIxHz0r1/Yq7Juo2j3DUvAGGJxlMsy7WNAR58hhY6OM=; b=msfBq3OuciRQQtuCnkZBmWTuRme59R3FAhdybP4VkIoztZf9T6vKGSZfiOlfEomec3 /9zlWJw8JDascZu+Nqu8hhXhtgNjPxTdGDFxiN2KDOk4SKqucU4d6WbZtIOpw5zZnpvZ gywt7EfYCKB9cabIJzxcCiOywnyadqJmkhNYclDWKNNk/NnshE2wzSUoOjXBi7JBHn2+ nOU5x8L1Uqms0UF82w2t7PlGn9PBaV9PzknsJWg+0P5lai8S9elcp0K4xuZkD5afCyzV NAI2KWOvHdMsWL2OwRMoitOsorjs0mYkivvJ9nCTrK8DsBAak9IMT2y4hanlYYceuwnV uHKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="NYi/Bs8C"; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q11-20020a65494b000000b00478e7f82dd3si28040385pgs.543.2023.01.15.12.40.03; Sun, 15 Jan 2023 12:40:16 -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="NYi/Bs8C"; 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 S231633AbjAOUVf (ORCPT + 99 others); Sun, 15 Jan 2023 15:21:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231584AbjAOUV0 (ORCPT ); Sun, 15 Jan 2023 15:21:26 -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 F1FC012F24 for ; Sun, 15 Jan 2023 12:21:10 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id bk15so6207332ejb.9 for ; Sun, 15 Jan 2023 12:21:10 -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=zIxHz0r1/Yq7Juo2j3DUvAGGJxlMsy7WNAR58hhY6OM=; b=NYi/Bs8CBj2l9N41+UF6lF0VbthfjqI9PnVAnp0jaqm4VWm8RLGygg90ZiQTOi0eLn T/9XiR7vNKS2HK1BckW6TwnP5w0UnFOy5m8bAgQ9alDTDKDcqKJgFOPCTuy4MbwoHHDU +buYWwx6mC4ZmnJ4IsAlzG+aReczuE7VHpRZdQV5SEeNCcWXkq9qUL8EUgtu0NIWkd78 gdh0BIM9M/ttIvPFNVOJvc9bzltBSmG5txqLw4APi/dO/uyQ+3xkCQJW/goWcu/O1aUO JLWdvKnJUkFDOCLfKAK1d64isNPY1cbQ7K35rBPQDgtaQEwpjlT2dPn2AqkiKEQRsK9S kjAg== 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=zIxHz0r1/Yq7Juo2j3DUvAGGJxlMsy7WNAR58hhY6OM=; b=3Bh4Gw3946EH7qWnb7f10Hh4fsRh9//GxUr3ZOmcT8qETI841HVweBGysEhU1O365q AdCGI0FszzFWYyZkX6gImfG1YmJH/JvQ1Y0Lxn0jA5pTxJZg0eo5tsoHfJXkB8+1cFeY Z6jQGyw/6SvHIf+AadtE20qpP9/aBBPaNJlspBvoEPMhp3jTRlXCFQ6pIUsYgz7awTwc vx+xclky2F0+FdI2GmfTwr60ypgc7IPIAw7LRLwHUolqVZxgkB49D7S74Ln+or1vJBxp 9rJs4bb3xxiInMwNVbQysaYSC6ULn/6MYB3yDYz0qzQrlDPQvoxjbQWJybTiT9ErH6Nl QiAg== X-Gm-Message-State: AFqh2kpsASEWmIeQHFazPHMWFAXlSG45oUkks7VD971Qx5ieA4U2K/Xg Oi69nCa5v/vYLRF4QdngTsCTWyZl1w8= X-Received: by 2002:a17:906:280d:b0:837:c290:eb83 with SMTP id r13-20020a170906280d00b00837c290eb83mr19100862ejc.2.1673814069409; Sun, 15 Jan 2023 12:21:09 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id c2-20020a17090618a200b0077a8fa8ba55sm10928478ejf.210.2023.01.15.12.21.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:21:08 -0800 (PST) Date: Sun, 15 Jan 2023 21:21:07 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Rename EEPROMTxPower.., AutoloadF.. and SilentReset.. Message-ID: <328bdd5fd16ba000d2083473e16e89ce2e2521ee.1673812850.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755122204063135889?= X-GMAIL-MSGID: =?utf-8?q?1755122464203653742?= Rename variable EEPROMTxPowerLevelCCK to eeprom_tx_pwr_level_cck, AutoloadFailFlag to autoload_fail_flag and SilentResetRxStuckEvent to silent_reset_rx_stuck_event to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 30 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 655a7966a876..8522a4b9b8f1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -292,12 +292,12 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) if (EEPROMId != RTL8190_EEPROM_ID) { netdev_err(dev, "%s(): Invalid EEPROM ID: %x\n", __func__, EEPROMId); - priv->AutoloadFailFlag = true; + priv->autoload_fail_flag = true; } else { - priv->AutoloadFailFlag = false; + priv->autoload_fail_flag = false; } - if (!priv->AutoloadFailFlag) { + if (!priv->autoload_fail_flag) { priv->eeprom_vid = rtl92e_eeprom_read(dev, EEPROM_VID >> 1); priv->eeprom_did = rtl92e_eeprom_read(dev, EEPROM_DID >> 1); @@ -331,7 +331,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->eeprom_chnl_plan = 0; } - if (!priv->AutoloadFailFlag) { + if (!priv->autoload_fail_flag) { u8 addr[ETH_ALEN]; for (i = 0; i < 6; i += 2) { @@ -352,7 +352,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->rf_type = RTL819X_DEFAULT_RF_TYPE; if (priv->card_8192_version > VERSION_8190_BD) { - if (!priv->AutoloadFailFlag) { + if (!priv->autoload_fail_flag) { tempval = (rtl92e_eeprom_read(dev, (EEPROM_RFInd_PowerDiff >> 1))) & 0xff; priv->eeprom_legacy_ht_tx_pwr_diff = tempval & 0xf; @@ -365,7 +365,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->eeprom_legacy_ht_tx_pwr_diff = 0x04; } - if (!priv->AutoloadFailFlag) + if (!priv->autoload_fail_flag) priv->eeprom_thermal_meter = ((rtl92e_eeprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00) >> 8; @@ -374,7 +374,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) priv->tssi_13dBm = priv->eeprom_thermal_meter * 100; if (priv->epromtype == EEPROM_93C46) { - if (!priv->AutoloadFailFlag) { + if (!priv->autoload_fail_flag) { usValue = rtl92e_eeprom_read(dev, EEPROM_TxPwDiff_CrystalCap >> 1); priv->eeprom_ant_pwr_diff = usValue & 0x0fff; @@ -388,16 +388,16 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) } for (i = 0; i < 14; i += 2) { - if (!priv->AutoloadFailFlag) + if (!priv->autoload_fail_flag) usValue = rtl92e_eeprom_read(dev, (EEPROM_TxPwIndex_CCK + i) >> 1); else usValue = EEPROM_Default_TxPower; - *((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) = + *((u16 *)(&priv->eeprom_tx_pwr_level_cck[i])) = usValue; } for (i = 0; i < 14; i += 2) { - if (!priv->AutoloadFailFlag) + if (!priv->autoload_fail_flag) usValue = rtl92e_eeprom_read(dev, (EEPROM_TxPwIndex_OFDM_24G + i) >> 1); else @@ -409,7 +409,7 @@ static void _rtl92e_read_eeprom_info(struct net_device *dev) if (priv->epromtype == EEPROM_93C46) { for (i = 0; i < 14; i++) { priv->tx_pwr_level_cck[i] = - priv->EEPROMTxPowerLevelCCK[i]; + priv->eeprom_tx_pwr_level_cck[i]; priv->tx_pwr_level_ofdm_24g[i] = priv->eeprom_tx_pwr_level_ofdm24g[i]; } @@ -2126,21 +2126,21 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum; if (priv->rx_ctr == RegRxCounter) { - priv->SilentResetRxStuckEvent[SlotIndex] = 1; + priv->silent_reset_rx_stuck_event[SlotIndex] = 1; for (i = 0; i < SilentResetRxSoltNum; i++) - TotalRxStuckCount += priv->SilentResetRxStuckEvent[i]; + TotalRxStuckCount += priv->silent_reset_rx_stuck_event[i]; if (TotalRxStuckCount == SilentResetRxSoltNum) { bStuck = true; for (i = 0; i < SilentResetRxSoltNum; i++) TotalRxStuckCount += - priv->SilentResetRxStuckEvent[i]; + priv->silent_reset_rx_stuck_event[i]; } } else { - priv->SilentResetRxStuckEvent[SlotIndex] = 0; + priv->silent_reset_rx_stuck_event[SlotIndex] = 0; } priv->rx_ctr = RegRxCounter; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index 9cb717892dcb..bd524a818776 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -406,7 +406,7 @@ struct r8192_priv { u8 check_roaming_cnt; u32 SilentResetRxSlotIndex; - u32 SilentResetRxStuckEvent[MAX_SILENT_RESET_RX_SLOT_NUM]; + u32 silent_reset_rx_stuck_event[MAX_SILENT_RESET_RX_SLOT_NUM]; u16 basic_rate; u8 short_preamble; @@ -414,7 +414,7 @@ struct r8192_priv { u8 slot_time; u16 SifsTime; - bool AutoloadFailFlag; + bool autoload_fail_flag; short epromtype; u16 eeprom_vid; @@ -422,7 +422,7 @@ struct r8192_priv { u8 eeprom_CustomerID; u16 eeprom_chnl_plan; - u8 EEPROMTxPowerLevelCCK[14]; + u8 eeprom_tx_pwr_level_cck[14]; u8 eeprom_tx_pwr_level_ofdm24g[14]; u8 EEPROMRfACCKChnl1TxPwLevel[3]; u8 EEPROMRfAOfdmChnlTxPwLevel[3]; From patchwork Sun Jan 15 20:21:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 43894 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp892025wrn; Sun, 15 Jan 2023 12:36:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXveX4Sr4KjOp5p0jpxxnFebsayKbg2LoHbPkQjZ0HE0ErFVt1vtUGtvObpfthod0p7JhTIm X-Received: by 2002:a17:902:b78c:b0:193:1fc5:f611 with SMTP id e12-20020a170902b78c00b001931fc5f611mr31129083pls.38.1673814968305; Sun, 15 Jan 2023 12:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673814968; cv=none; d=google.com; s=arc-20160816; b=B7JuVnahy1jPhRjMbRFuOYbgUxEE/Oumai1kCH7Z+jMEvKY8pRZvBi09u/1KVINXz4 8Noo/qMs+YIlkbHqgjIXT5Mu3iPhKghSLRL1F7QDocXLpZ3IeQN7wcpqg8x6Nt8aWHWQ 0RclYL1DryGIHi9j+l4nSAoMcZJP7f04AJkBPV+ZIhhuxgYQnwUzDNL8zO2EuPHK67mI hp4cSTXfPup6zWY+sbqgGKDjJYSB8mksRwHAukrrTD8Mzug/125dK7Xdw9ZpkJsgVbqw ZSAE6NlVSsFpdwG0N5Vi2MQNXvg3FfrWeZF9dIv7KtNk/yjZqvV263Hq5Dmd9bLiM1UZ UWEA== 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=+otSAik9O2Fw7DnAYDScejyC3Rd16+BHk2obm2UhJYE=; b=MIGjx6QuF5VJ1UicwQ9TzOnc4CqttuS6dBdUxkrDaQTIkbpKwa6t15wW6HcvYZZvOW UYoYQRTFHShwyZ96O36PNWgxx7nPi4V+xJyGQ/nlH66ASi5gLOmh+rw53KPuNELi2hyb HHOCwXWUm8KH3B/QB+4C/X0TbWB8SOqdPWGi6d7haxX9T0tNaoY/7ZDL797ycuYei1KI 317mKeQ/uHlNYkyK8tQNNQvOo6kZ8V84ysEDYWXwxG7YnyDwXy50UoXzJZicHnlRndvx X2Ha0sI1Rj7QeXxJt9TAGA87u4At81jGPiKapbxVWlW7XWEotGylaMFfzw3cIQFGE21w tinQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=p8rSnuvi; 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: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b23-20020a170902b61700b00194821e608dsi4130581pls.387.2023.01.15.12.35.52; Sun, 15 Jan 2023 12:36:08 -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=p8rSnuvi; 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 S231636AbjAOUV6 (ORCPT + 99 others); Sun, 15 Jan 2023 15:21:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231600AbjAOUVc (ORCPT ); Sun, 15 Jan 2023 15:21:32 -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 BDF8D1448D for ; Sun, 15 Jan 2023 12:21:17 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id v6so20696621ejg.6 for ; Sun, 15 Jan 2023 12:21:17 -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=+otSAik9O2Fw7DnAYDScejyC3Rd16+BHk2obm2UhJYE=; b=p8rSnuviDnbZz5yS4kcZbexgS3qS7RMQhjxTlO885SOnEZztqbC4A4aU2+fPa9UZ3F kbJwOR9qWMN3CKtsj7w2UZW84+Ii0GCmb7W91ks/LPukKdnMa/F6HAFnlSZ2xre6btmj 2kPGZvLQwrx+VZmXz/+dnR3PW0hX7kCFbbzN8D/Q7fYgbVhB/70Zr7rONj0r/l0Ybm7s zOlP7pgLJU6OLHVHb1+Vv94g6gCbBeg77rnFJz2n7UUdd/h559Vfqu4+97SqFmxGlWKe q9UWyylQa6jxevsryivU2Hi8EMdewIS6ZDh631LaDm91IWwbaqZd8b3Ln1JGM1+8dDR2 b0XQ== 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=+otSAik9O2Fw7DnAYDScejyC3Rd16+BHk2obm2UhJYE=; b=NhwOfCJVfZg89P86GWSMpq6QiYiw2mXfFqXuh0wvaT7WwJ9kiz7FCRRZedhjMoDSL4 7riA/NFvY+/c4J4AwL/xAXgUN29fJDN5m3s1pWm6NyEtcYSLai1NvTPfglY5cLBsyGJD LTTUhXmn4sOTRviTaHDxK1SmIuUvi9wrokI6+SDhOpOqvvwLEePWfrG3TQJyNTG2gHIe Pu0o0Yei26PmjSrKfYFPqI3wvafihEjxvTUHhRXEU72VVEv+zapHOplyI0objU7YWBS0 mWRYkS6QYX05qXVEWl/2IouNhXI2yCv08/k4Mv4M8k8IhqWj3Hg0WY9OPr/Wk6APGqtL Rggw== X-Gm-Message-State: AFqh2kqmSCBBsGH2k4nzRx8VNuwU2xU2ejp/EH+1JOY1UoTFxXiCvDa8 MqL5xhS8F5rQNcvpSKUigkk= X-Received: by 2002:a17:907:c018:b0:7b9:861b:9744 with SMTP id ss24-20020a170907c01800b007b9861b9744mr16723641ejc.1.1673814076360; Sun, 15 Jan 2023 12:21:16 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id kx4-20020a170907774400b007c10d47e748sm10947215ejc.36.2023.01.15.12.21.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 12:21:15 -0800 (PST) Date: Sun, 15 Jan 2023 21:21:14 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Rename EEPROMTxPower.., AutoloadF.. and SilentReset.. Message-ID: <60c1fb2861143c8736f061cf85e737b78c210a09.1673812850.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755122204063135889?= X-GMAIL-MSGID: =?utf-8?q?1755122204063135889?= Rename variable SilentResetRxSlotIndex to silent_reset_rx_slot_index, IC_Cut to ic_cut and Rf_Mode to rf_mode to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 ++++++------ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 8522a4b9b8f1..9cffe09e429c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -614,7 +614,7 @@ bool rtl92e_start_adapter(struct net_device *dev) start: rtl92e_reset_desc_ring(dev); - priv->Rf_Mode = RF_OP_By_SW_3wire; + priv->rf_mode = RF_OP_By_SW_3wire; if (priv->rst_progress == RESET_TYPE_NORESET) { rtl92e_writeb(dev, ANAPAR, 0x37); mdelay(500); @@ -724,7 +724,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } tmpvalue = rtl92e_readb(dev, IC_VERRSION); - priv->IC_Cut = tmpvalue; + priv->ic_cut = tmpvalue; bfirmwareok = rtl92e_init_fw(dev); if (!bfirmwareok) { @@ -760,14 +760,14 @@ bool rtl92e_start_adapter(struct net_device *dev) } if (priv->rtllib->FwRWRF) - priv->Rf_Mode = RF_OP_By_FW; + priv->rf_mode = RF_OP_By_FW; else - priv->Rf_Mode = RF_OP_By_SW_3wire; + priv->rf_mode = RF_OP_By_SW_3wire; if (priv->rst_progress == RESET_TYPE_NORESET) { rtl92e_dm_init_txpower_tracking(dev); - if (priv->IC_Cut >= IC_VersionCut_D) { + if (priv->ic_cut >= IC_VersionCut_D) { tmpRegA = rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord); rtl92e_get_bb_reg(dev, rOFDM0_XCTxIQImbalance, bMaskDWord); @@ -2123,7 +2123,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) } - SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum; + SlotIndex = (priv->silent_reset_rx_slot_index++)%SilentResetRxSoltNum; if (priv->rx_ctr == RegRxCounter) { priv->silent_reset_rx_stuck_event[SlotIndex] = 1; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c index 6da76ea16ff1..97e859425784 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -203,7 +203,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter) return; - if (priv->Rf_Mode == RF_OP_By_FW) { + if (priv->rf_mode == RF_OP_By_FW) { if (BitMask != bMask12Bits) { Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, RegAddr); @@ -240,7 +240,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90_radio_path eRFPath, if (priv->rtllib->rf_power_state != rf_on && !priv->being_init_adapter) return 0; mutex_lock(&priv->rf_mutex); - if (priv->Rf_Mode == RF_OP_By_FW) { + if (priv->rf_mode == RF_OP_By_FW) { Original_Value = _rtl92e_phy_rf_fw_read(dev, eRFPath, RegAddr); udelay(200); } else { @@ -533,7 +533,7 @@ static bool _rtl92e_bb_config_para_file(struct net_device *dev) _rtl92e_phy_config_bb(dev, BaseBand_Config_AGC_TAB); - if (priv->IC_Cut > VERSION_8190_BD) { + if (priv->ic_cut > VERSION_8190_BD) { if (priv->rf_type == RF_2T4R) dwRegValue = priv->antenna_tx_pwr_diff[2] << 8 | priv->antenna_tx_pwr_diff[1] << 4 | @@ -886,7 +886,7 @@ static u8 _rtl92e_phy_switch_channel_step(struct net_device *dev, u8 channel, continue; switch (CurrentCmd->CmdID) { case CmdID_SetTxPowerLevel: - if (priv->IC_Cut > VERSION_8190_BD) + if (priv->ic_cut > VERSION_8190_BD) _rtl92e_set_tx_power_level(dev, channel); break; @@ -1088,7 +1088,7 @@ static void _rtl92e_cck_tx_power_track_bw_switch(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - if (priv->IC_Cut >= IC_VersionCut_D) + if (priv->ic_cut >= IC_VersionCut_D) _rtl92e_cck_tx_power_track_bw_switch_tssi(dev); else _rtl92e_cck_tx_power_track_bw_switch_thermal(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index bd524a818776..d86577277844 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -396,16 +396,16 @@ struct r8192_priv { u32 irq_mask[2]; - u8 Rf_Mode; + u8 rf_mode; enum nic_t card_8192; u8 card_8192_version; u8 rf_type; - u8 IC_Cut; + u8 ic_cut; char nick[IW_ESSID_MAX_SIZE + 1]; u8 check_roaming_cnt; - u32 SilentResetRxSlotIndex; + u32 silent_reset_rx_slot_index; u32 silent_reset_rx_stuck_event[MAX_SILENT_RESET_RX_SLOT_NUM]; u16 basic_rate; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 96c45e5172bd..63be5f2872c6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -857,7 +857,7 @@ void rtl92e_dm_txpower_tracking_wq(void *data) struct r8192_priv, txpower_tracking_wq); struct net_device *dev = priv->rtllib->dev; - if (priv->IC_Cut >= IC_VersionCut_D) + if (priv->ic_cut >= IC_VersionCut_D) _rtl92e_dm_tx_power_tracking_callback_tssi(dev); else _rtl92e_dm_tx_power_tracking_cb_thermal(dev); @@ -891,7 +891,7 @@ void rtl92e_dm_init_txpower_tracking(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - if (priv->IC_Cut >= IC_VersionCut_D) + if (priv->ic_cut >= IC_VersionCut_D) _rtl92e_dm_initialize_tx_power_tracking_tssi(dev); else _rtl92e_dm_init_tx_power_tracking_thermal(dev); @@ -952,7 +952,7 @@ static void _rtl92e_dm_check_tx_power_tracking(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - if (priv->IC_Cut >= IC_VersionCut_D) + if (priv->ic_cut >= IC_VersionCut_D) _rtl92e_dm_check_tx_power_tracking_tssi(dev); else _rtl92e_dm_check_tx_power_tracking_thermal(dev); @@ -1038,7 +1038,7 @@ void rtl92e_dm_cck_txpower_adjust(struct net_device *dev, bool binch14) { struct r8192_priv *priv = rtllib_priv(dev); - if (priv->IC_Cut >= IC_VersionCut_D) + if (priv->ic_cut >= IC_VersionCut_D) _rtl92e_dm_cck_tx_power_adjust_tssi(dev, binch14); else _rtl92e_dm_cck_tx_power_adjust_thermal_meter(dev, binch14);