From patchwork Thu Jul 6 02:16:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 116484 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2276582vqx; Wed, 5 Jul 2023 20:01:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlFofd6pc6ltdjBf56yqD9U3eKh3KLLgOCUDbKyeEZ5Fqbt15q3ypmJAGTVafKrPB+RGR3OM X-Received: by 2002:a67:e903:0:b0:444:bf8f:a939 with SMTP id c3-20020a67e903000000b00444bf8fa939mr431899vso.12.1688612516197; Wed, 05 Jul 2023 20:01:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688612516; cv=none; d=google.com; s=arc-20160816; b=iQsaR/kPISLkCD3n8aVNL/B7PU3pCnbgjpidumCUN1SwdKgN34mNsAk2uV0QD5hULo ALFwdmJ2WanBer+rJsEwwHUs0sTyb6qVNoRmRCgrcGVKy7jj0mx8rtZYl4M/3G8kB8D9 NS1tNw77Nx4lSFVKgLYqGSlUq2m0+NmyHSB8bDgUkr/Gg2m7FPSlok/yU2pzkiT9GWzw 1r1nhqsNMyDfYlEPKEml/gth6XGhaBG09ZVZZQIemiaScjgIvOpmXALKVsL8lmo9hkNp BSPtN8fu9Xa1AYVsyupLjHQfaf7zUoajS0Ep0bEA7fjA2/qE6yGcwgJCOUOxX0C0/bCz Muhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=5rz/m38QBAmhzeA8fpk1dGSZg0YX/Za6LlLzwdW7Fu0=; fh=DkhT+mC+s1UnjoPCPMrKwseCwEs9oGld44tQOGsYr8Q=; b=FTV3PDr4SyMe0iMfm0D60eL8TKVY5Ox2HKHYMz1cQkTpa4ODz2uXNTHdc7XEK3mOe9 9FjqkRtvyEfvBpV7ndMzMlQ2a8AJQgEyUmXA/cbzz6DTECk+4pmj2tt/nbqhd1HikCZs E4oI30LZ/PlsyZXSZO1Q2esde7XUEUkqxl1E3K/jzA6WIHlhqoYRCYZCRXfG/0CP9lmK m7RTtWkTqDHSOg9B99m2Xc5hNgjs2vmxhjezLNklbQy4xwsrmhSjQeOgZo83uo6DoDts AZr356JQSsOjE6FvzW403F3pP1Q3LETMCHnc2/Y2dch9Nr4vxQsMaGDOlkDhtQ5VtEo+ LB4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=hnKFr1ie; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=j6xrx9aL; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f3-20020a631f03000000b0051394ccd19csi572885pgf.55.2023.07.05.20.01.41; Wed, 05 Jul 2023 20:01:56 -0700 (PDT) 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=@pobox.com header.s=sasl header.b=hnKFr1ie; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=j6xrx9aL; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232832AbjGFCQu (ORCPT + 99 others); Wed, 5 Jul 2023 22:16:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229527AbjGFCQt (ORCPT ); Wed, 5 Jul 2023 22:16:49 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B3C4FC for ; Wed, 5 Jul 2023 19:16:48 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id DF69D19C07; Wed, 5 Jul 2023 22:16:47 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= fQRURmtGU9+VkKlIsI3Hm+nfj5STTvRmot52VrL0YUQ=; b=hnKFr1ieuENSMhAc F0VMd8F/kHo+CZQ/TSPS/CPgAeQabXMKlDWZV8p3suL+em2+ViOGixoYj2Z8Ez88 xOFRsgIwGQHm/89kEGentVt8/eFhk4F9MMv3G9U5lMaWsRrKCGWGt/h+THQ8u4nz CKOMUjCpFHgBnW2/skl2wrGY6Ts= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id D687619C06; Wed, 5 Jul 2023 22:16:47 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=fQRURmtGU9+VkKlIsI3Hm+nfj5STTvRmot52VrL0YUQ=; b=j6xrx9aL4Z97iylqOFSGe5VwFVyCTFNba3/x/ADAqqAfDYRDKYS1zzKwtE9CKdFDETFyaxKHWb+A9vTenteLCUce7saYYeL9X2NMT30AbrjiZHhlZ/GtIi+C8xtkuljq/Je6xafFu1NVRc7hmLM8UzoDBl1S/uS7x7j/MaZe1fs= Received: from kimchi.darkphysics (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 63C7319C04; Wed, 5 Jul 2023 22:16:44 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 5 Jul 2023 19:16:38 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, dan.carpenter@linaro.org Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: rtl8192e: Rename variable bRegShortGI40MHz Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 271BBBDA-1BA3-11EE-BDD1-B31D44D1D7AA-45285927!pb-smtp21.pobox.com X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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?1770638557434893369?= X-GMAIL-MSGID: =?utf-8?q?1770638557434893369?= This patch renames variable bRegShortGI40MHz to breg_short_gi_40MHz to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 2bbd01048561..07102ce5ef5d 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -96,7 +96,7 @@ struct rt_hi_throughput { u8 bCurrentHTSupport; u8 bRegBW40MHz; u8 bCurBW40MHz; - u8 bRegShortGI40MHz; + u8 breg_short_gi_40MHz; u8 bCurShortGI40MHz; u8 bRegShortGI20MHz; u8 bCurShortGI20MHz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index f9fa3f2bb728..1844098a4308 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -72,7 +72,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) struct rt_hi_throughput *ht_info = ieee->ht_info; ht_info->bRegShortGI20MHz = 1; - ht_info->bRegShortGI40MHz = 1; + ht_info->breg_short_gi_40MHz = 1; ht_info->bRegBW40MHz = 1; @@ -545,7 +545,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->bCurShortGI20MHz = ((ht_info->bRegShortGI20MHz) ? ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false) : false); - ht_info->bCurShortGI40MHz = ((ht_info->bRegShortGI40MHz) ? + ht_info->bCurShortGI40MHz = ((ht_info->breg_short_gi_40MHz) ? ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false) : false); @@ -781,7 +781,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) ht_info->bCurBW40MHz = ht_info->bRegBW40MHz; ht_info->bCurShortGI20MHz = ht_info->bRegShortGI20MHz; - ht_info->bCurShortGI40MHz = ht_info->bRegShortGI40MHz; + ht_info->bCurShortGI40MHz = ht_info->breg_short_gi_40MHz; if (ieee->iw_mode == IW_MODE_ADHOC) ieee->current_network.qos_data.active =