From patchwork Thu Jul 6 02:11:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 116481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2267925vqx; Wed, 5 Jul 2023 19:33:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlFpULOAromqX93atazSdAsdgNXr+orXGsLwnFdtRQxoGxSaQgOf7DbY6AhjGNqtJxjgDlWZ X-Received: by 2002:a0c:e44d:0:b0:62d:ef66:ff1c with SMTP id d13-20020a0ce44d000000b0062def66ff1cmr350545qvm.24.1688610832265; Wed, 05 Jul 2023 19:33:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688610832; cv=none; d=google.com; s=arc-20160816; b=O5478y4TVbqtOJ4/EACSK7vvzbypkMq/fNOt1GiqK76lrCrojwPEUTZ+XUwtoyszNg vFgEnJsFivnWYP3DfkeDMt3s9BkbQbRbpPZMZaaDgchzx/m+tkGoJuPK3pW9KKgtYKS7 RzGKlNN+sX2gMnww5D6tYTDxfB37KQWFH0AIZMs0qC6mH+CJmZaE74u0WY8hwL7tGzO3 HyrcqZbqsTTow7Q8yfkAFDG/UsLS4u091692UzsEWEvty/6SFnxbri/Nr7E5VVuzuTNL H/zzb3bLx2IQNWHc98YwPjdcqh2zM/sAPqQRa4f1bFeyy1lUilPth60QMlsMKMG67dxz pDgg== 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=KllhJzRaDkRTdC7MYHBlPIuXTcXTHBS56dtlSaavtG4=; fh=DkhT+mC+s1UnjoPCPMrKwseCwEs9oGld44tQOGsYr8Q=; b=aBldjBlAedqHqxGttsi42OIfZ5mu03cN715QEVa/AZhgU5PxnKG5Q00y2NH/6Uibcw DNJNs/CWTduO82uLVo4mDXJQVl9ovRupJghUnXCLI3GfhcfPwsongjkXJ3kuHb/HFAvt ELiAEbysI4YPomYXmqyrdgSY5LyhTOX+m/pnvmwAYswkN9kTqVaq00N33h2BzHwv/T/j cWMguCQ5+Bw5rUL7wEOj0MaqHCT5HG3nbhzDse+i7CcYZO+BTbhuOSYvJYhKT3W2MdBh k/i/8YV/AywBlk4CqOrqzuPmD7GLcIqMBf1YwMfuTUuYh1bCRnHho9OJa8+eYjJgWOWt JIsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=q55AfFZz; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="o3PrM7/M"; 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 u38-20020a634566000000b0053490e8df4dsi474894pgk.104.2023.07.05.19.33.37; Wed, 05 Jul 2023 19:33:52 -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=q55AfFZz; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="o3PrM7/M"; 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 S233054AbjGFCL3 (ORCPT + 99 others); Wed, 5 Jul 2023 22:11:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232276AbjGFCL2 (ORCPT ); Wed, 5 Jul 2023 22:11:28 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 583A4E63 for ; Wed, 5 Jul 2023 19:11:27 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id D41943587A; Wed, 5 Jul 2023 22:11:26 -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= dSl4DkD4FZzj44yjnUm+36Ptc1v3LHeAeOXXQZIN4tg=; b=q55AfFZzzkAqskpu 2DqJ+2S9SydwFtd0RQyMq/qkEu+TIHRogWc+LCobCEPaPhWCaIzVoV/AZLeJE+Yt g/RRQz7zmPbeMWL6aapS4zR3BIV/lL4tNWqKN1BonMOPNwH+q7+vIiRGGGeyiUcf PvWSZ8NMadyOaSPTvtZWFfyOYRU= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id CAB3A35879; Wed, 5 Jul 2023 22:11:26 -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=dSl4DkD4FZzj44yjnUm+36Ptc1v3LHeAeOXXQZIN4tg=; b=o3PrM7/Ms69qGX0q2+HRuh6Xlohu3cPC0OjO0Us3UrwoJuKJsZCzf6ZMb9Z41MtjiEi+5LeRHlLUzgaU5TYcYFvwhBBFSlMbASRWetyV/LC8bkUKRAlB3NvTbPmpcFSXtoyadId948aas1hkRL0kujBx+krl1ib71GVS+wD7Z4E= 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-smtp20.pobox.com (Postfix) with ESMTPSA id 5355635878; Wed, 5 Jul 2023 22:11:23 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 5 Jul 2023 19:11:15 -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 bRegBW40MHz Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 67BC9C00-1BA2-11EE-AA33-C2DA088D43B2-45285927!pb-smtp20.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?1770636792102653126?= X-GMAIL-MSGID: =?utf-8?q?1770636792102653126?= This patch renames variable bRegBW40MHz to breg_bw_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 | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 2bbd01048561..afe27a022134 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -94,7 +94,7 @@ enum ht_aggre_mode { struct rt_hi_throughput { u8 enable_ht; u8 bCurrentHTSupport; - u8 bRegBW40MHz; + u8 breg_bw_40MHz; u8 bCurBW40MHz; u8 bRegShortGI40MHz; u8 bCurShortGI40MHz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index f9fa3f2bb728..3fe98672b648 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -74,9 +74,9 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) ht_info->bRegShortGI20MHz = 1; ht_info->bRegShortGI40MHz = 1; - ht_info->bRegBW40MHz = 1; + ht_info->breg_bw_40MHz = 1; - if (ht_info->bRegBW40MHz) + if (ht_info->breg_bw_40MHz) ht_info->bRegSuppCCK = 1; else ht_info->bRegSuppCCK = true; @@ -296,7 +296,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) pCapELE->ChlWidth = 0; else - pCapELE->ChlWidth = (pHT->bRegBW40MHz ? 1 : 0); + pCapELE->ChlWidth = (pHT->breg_bw_40MHz ? 1 : 0); pCapELE->MimoPwrSave = pHT->self_mimo_ps; pCapELE->GreenField = 0; @@ -307,7 +307,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, pCapELE->RxSTBC = 0; pCapELE->DelayBA = 0; pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0; - pCapELE->DssCCk = ((pHT->bRegBW40MHz) ? (pHT->bRegSuppCCK ? 1 : 0) : 0); + pCapELE->DssCCk = ((pHT->breg_bw_40MHz) ? (pHT->bRegSuppCCK ? 1 : 0) : 0); pCapELE->PSMP = 0; pCapELE->LSigTxopProtect = 0; @@ -366,12 +366,12 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, if ((ieee->iw_mode == IW_MODE_ADHOC) || (ieee->iw_mode == IW_MODE_MASTER)) { pHTInfoEle->ControlChl = ieee->current_network.channel; - pHTInfoEle->ExtChlOffset = ((!pHT->bRegBW40MHz) ? + pHTInfoEle->ExtChlOffset = ((!pHT->breg_bw_40MHz) ? HT_EXTCHNL_OFFSET_NO_EXT : (ieee->current_network.channel <= 6) ? HT_EXTCHNL_OFFSET_UPPER : HT_EXTCHNL_OFFSET_LOWER); - pHTInfoEle->RecommemdedTxWidth = pHT->bRegBW40MHz; + pHTInfoEle->RecommemdedTxWidth = pHT->breg_bw_40MHz; pHTInfoEle->RIFS = 0; pHTInfoEle->PSMPAccessOnly = 0; pHTInfoEle->SrvIntGranularity = 0; @@ -778,7 +778,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) ht_info->bCurrentHTSupport = true; ht_info->bCurSuppCCK = ht_info->bRegSuppCCK; - ht_info->bCurBW40MHz = ht_info->bRegBW40MHz; + ht_info->bCurBW40MHz = ht_info->breg_bw_40MHz; ht_info->bCurShortGI20MHz = ht_info->bRegShortGI20MHz; ht_info->bCurShortGI40MHz = ht_info->bRegShortGI40MHz; @@ -850,7 +850,7 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, { struct rt_hi_throughput *ht_info = ieee->ht_info; - if (!ht_info->bRegBW40MHz) + if (!ht_info->breg_bw_40MHz) return; if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))