From patchwork Wed Jan 18 19:58:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 45449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2534285wrn; Wed, 18 Jan 2023 12:00:12 -0800 (PST) X-Google-Smtp-Source: AMrXdXvsSUh953W+Ku9kSywH3OdS41ORpMiLlw0adFIcLHtWq/eq68yfXGm+YYafvR4azfrfvM0c X-Received: by 2002:a05:6a20:54a7:b0:b8:4c8a:df85 with SMTP id i39-20020a056a2054a700b000b84c8adf85mr11483921pzk.20.1674072012168; Wed, 18 Jan 2023 12:00:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674072012; cv=none; d=google.com; s=arc-20160816; b=XHEyEBL44Lh6McVV8D6u6vjhMMVS0G/ShjSYhG/V2weW3TdhJnK/svvjFkdoL9fVww 7zHrVYJyhbCkrT9HF+/MYEjzos7nUhDAMgCefReRIa9TPnf5pTc3UeSe1+7FUcgT/blp c2rBgmUjiVThdC+9r5a33IK5GwUaUEChjJbRV+5xVZY/7PPSqllowT9xhvwOd9Vl74W0 S0fcNtstuYmErufUQfpKaWwhaD8Iwy3mAi9mgPVtIeIuRyQDkIqcUH/ZAaFLulCMzFIa cKoEUFc0aPdd0h5tngDjeeKY2kOUKOY0jkMGN9fFTUuC7qxJrbJQZ/DkkyINKo6TB4Qt HguQ== 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=m9CjOhr96xi9+FpZ47u/Q+cReHr932dPgU5qJKbRN1E=; b=PKdP0xpXQNcFFYXLrYFeRX2u2WGx0JNp6OmmmkPciUpDNSp+Au7ayhxEzi/f94Rs/l kWNh1D3ZBhf9YesSWzySiY3s67UhejGH4rl+TBq3z3hst2Ingz/yymj/4qVKuazCk4bk NkIc4/R4gpNSOjmn+FA3d8UgpAo2QoCg82X6J9mtwOvs98ttTw8dIaeLFxXg1k4OtM4b r0NUXWGxLV4Lz33y3TwN78YUMY6WHKPoIegUl19LFe1dXCsuyqxdDKrrA4kNgfP8S3py YiHr54avvq2CC5fFdkCZxld7k2SohGYQT882Mz/XzOfgOslSZkXuyNy/dVIVmctIZ92c EzkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=CIWxY+44; 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 o23-20020a63fb17000000b0042b4defce13si39045167pgh.344.2023.01.18.12.00.00; Wed, 18 Jan 2023 12:00:12 -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=CIWxY+44; 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 S229702AbjART6t (ORCPT + 99 others); Wed, 18 Jan 2023 14:58:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbjART6q (ORCPT ); Wed, 18 Jan 2023 14:58:46 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA6E1539BC for ; Wed, 18 Jan 2023 11:58:44 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id e3so25868175wru.13 for ; Wed, 18 Jan 2023 11:58:44 -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=m9CjOhr96xi9+FpZ47u/Q+cReHr932dPgU5qJKbRN1E=; b=CIWxY+44CFjswsxEOsjN08VIfneDVaIqWWfMexnxkviLISJsENZaIKTPfncKhEIqo5 lUTJ8aI3aS8prjzNRUXXB26CwN6CQ5eF9rghP6JPnne85kLWHc9x8xSDpPiVDJsk+WEG FAceTSuMQca79cSm29KikvUeRzPNnYP7chMFW1HXPfmwc/07bIGBKIr7udOjQEIvfdOv 0PkYB3oyCnu99mWulM6oCmyiiXKFZ5NG3L3rzl/MYkgLhrPk2vSL5jQQyNWi6nWe7Daq R+jrL5xJpLIyUXgISpJfjlCbbHkuAO3iY6QjGKMpKNfbjtSC12zntBNP1yNV1nKm8rvl +vYw== 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=m9CjOhr96xi9+FpZ47u/Q+cReHr932dPgU5qJKbRN1E=; b=gpLfRDnGVCRF0WYSPulaWbV53tB1piChJX4jzdVJTPlTMiWgKsuY1HcKI1Jx77JNaA GurUbdXLDIA+X9UDA/9w3ne7kGMF33Bi+U9iX3UKtmQ4HPPoDqNGu13rJcjHQ3Y3i/BC kZAx5yeq1N7e8J8x8CqfDpX+YzRyHhQbAykSl6WP3HgAZt6W+K047WZapXXc+csTTMVB 33Z4ZMQr+F8PnplN2t39FDvzj7NHJKd8gX3UlskXl+hcaymNe2AJu7m6xwMZG4QSCoyc JmjlvpVjWudblmvRCwomzkigLtaoePQ5ObRgV/c/oa1Hj6H3eqfknEZud2Fqz5TwhkcW HrvQ== X-Gm-Message-State: AFqh2kp4uIoSbPNLJnRL6SJUyX4ksuDSvDzCKJAbU9mbNueWkKC4J3nb DQLKehK+bMsbCXr8Bc1LKuw= X-Received: by 2002:a05:6000:25c:b0:254:e300:df15 with SMTP id m28-20020a056000025c00b00254e300df15mr1608744wrz.1.1674071923277; Wed, 18 Jan 2023 11:58:43 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935ca5.dip0.t-ipconnect.de. [87.147.92.165]) by smtp.gmail.com with ESMTPSA id i6-20020adfe486000000b002423dc3b1a9sm31551031wrm.52.2023.01.18.11.58.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 11:58:42 -0800 (PST) Date: Wed, 18 Jan 2023 20:58:41 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/9] staging: rtl8192e: Rename LongRetryL.., ShortRetryL.. and ReceiveConfig Message-ID: <6e3920f3353ebc6dd1d039f54688fa1966cc431b.1674071236.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?1755391734211159888?= X-GMAIL-MSGID: =?utf-8?q?1755391734211159888?= Rename variable LongRetryLimit to long_retry_limit, ShortRetryLimit to short_retry_limit and ReceiveConfig to receive_config to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 26 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 9cffe09e429c..b0f33fbffa42 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -127,7 +127,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) Type = val[0]; RegRCR = rtl92e_readl(dev, RCR); - priv->ReceiveConfig = RegRCR; + priv->receive_config = RegRCR; if (Type) RegRCR |= (RCR_CBSSID); @@ -135,7 +135,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) RegRCR &= (~RCR_CBSSID); rtl92e_writel(dev, RCR, RegRCR); - priv->ReceiveConfig = RegRCR; + priv->receive_config = RegRCR; } break; @@ -594,8 +594,8 @@ static void _rtl92e_hwconfig(struct net_device *dev) rtl92e_writel(dev, RRSR, regRRSR); rtl92e_writew(dev, RETRY_LIMIT, - priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT | - priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT); + priv->short_retry_limit << RETRY_LIMIT_SHORT_SHIFT | + priv->long_retry_limit << RETRY_LIMIT_LONG_SHIFT); } bool rtl92e_start_adapter(struct net_device *dev) @@ -670,7 +670,7 @@ bool rtl92e_start_adapter(struct net_device *dev) (MXDMA2_NoLimit<dev_addr)[0]); rtl92e_writew(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]); - rtl92e_writel(dev, RCR, priv->ReceiveConfig); + rtl92e_writel(dev, RCR, priv->receive_config); rtl92e_writel(dev, RQPN1, NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT | @@ -860,9 +860,9 @@ void rtl92e_link_change(struct net_device *dev) if (ieee->intel_promiscuous_md_info.promiscuous_on) ; else - priv->ReceiveConfig = reg |= RCR_CBSSID; + priv->receive_config = reg |= RCR_CBSSID; } else - priv->ReceiveConfig = reg &= ~RCR_CBSSID; + priv->receive_config = reg &= ~RCR_CBSSID; rtl92e_writel(dev, RCR, reg); } @@ -874,12 +874,12 @@ void rtl92e_set_monitor_mode(struct net_device *dev, bool bAllowAllDA, struct r8192_priv *priv = rtllib_priv(dev); if (bAllowAllDA) - priv->ReceiveConfig |= RCR_AAP; + priv->receive_config |= RCR_AAP; else - priv->ReceiveConfig &= ~RCR_AAP; + priv->receive_config &= ~RCR_AAP; if (WriteIntoReg) - rtl92e_writel(dev, RCR, priv->ReceiveConfig); + rtl92e_writel(dev, RCR, priv->receive_config); } static u8 _rtl92e_rate_mgn_to_hw(u8 rate) @@ -2010,10 +2010,10 @@ rtl92e_init_variables(struct net_device *dev) priv->rtllib->tx_headroom = sizeof(struct tx_fwinfo_8190pci); - priv->ShortRetryLimit = 0x30; - priv->LongRetryLimit = 0x30; + priv->short_retry_limit = 0x30; + priv->long_retry_limit = 0x30; - priv->ReceiveConfig = RCR_ADD3 | + priv->receive_config = RCR_ADD3 | RCR_AMF | RCR_ADF | RCR_AICV | RCR_AB | RCR_AM | RCR_APM | diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index d86577277844..8de726de57f4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -362,7 +362,7 @@ struct r8192_priv { u64 LastRxDescTSF; - u32 ReceiveConfig; + u32 receive_config; u8 retry_data; u8 retry_rts; u16 rts; @@ -371,8 +371,8 @@ struct r8192_priv { int txringcount; atomic_t tx_pending[0x10]; - u16 ShortRetryLimit; - u16 LongRetryLimit; + u16 short_retry_limit; + u16 long_retry_limit; bool hw_radio_off; bool blinked_ingpio;