From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37B8FC636D3 for ; Tue, 7 Feb 2023 18:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230011AbjBGSQg (ORCPT ); Tue, 7 Feb 2023 13:16:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231586AbjBGSQ3 (ORCPT ); Tue, 7 Feb 2023 13:16:29 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAB4D3BDBD for ; Tue, 7 Feb 2023 10:16:19 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so3524294wmb.5 for ; Tue, 07 Feb 2023 10:16:19 -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=oRI/8f4x1/QMBaZh6y3RspGVRS7CNQfcVSPIlmfTuKk=; b=CEHDaKlFnjq8eOJ7jtg6rh8X1kLNTaq4jOzDRjY7pMD9YLrZzZLETWcVbasFEIYNW+ L50fI+ldxT5HOZoDJtuiN3igNjiWmxJx5AaxyeV/s9xgvZ7/6NjtYFueV8q6iW8YjeeH cu1Qu+fAMZ9Sv6+6WIMoZEYlU7/qPXs6FsCi9LqqGzGN9VeBY4g2gdo9foAyzBQI50dG 8+4lvw6R0dPITSGRzJgPLegkQ8eir6GXNVRcvOArfWkZWMZY/Cda5W4l6qRGFzFb/KoM PsLbrLUclqnGvpv3wdjMsnomwPSYNNuTtlfLx7bvwBXyO4xEJFLJ1gGLbe+jtLTN/jDu SEWg== 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=oRI/8f4x1/QMBaZh6y3RspGVRS7CNQfcVSPIlmfTuKk=; b=zSBsfK4yATBFwdI9upSuGzepENgHq8eOmpBSsWu+cPLEKp45akoaar+86s/wHrAjzp LDVuNtos/Vcqc0AIitBndAwyvX+zsetPQIzZ0zsgwVS/vjc67XMGoUOBaGhxiiE2vZtC pKW49Xksxyy2/EWiqwYTa7h/himIAB22cB89WiKTCS4c6r/tEBD+NmG/VDsYZCrxB3i5 4f7y7cShR0c9meNMxU12x6BWXEhYQ0/dhbXrwDAD6urG2wxVN1+pR/MIIDoy8IE+eeBt kFVehloJuzzgoV7/HQF/Kz6e9mizWufkeri3bIvDc6g3UcubsE5mwCURKqqNmC9YflfK W5oQ== X-Gm-Message-State: AO0yUKXmWuT4LtsOItmFDXx4kKdDJLPE9ULlFRK2kpcxYm1SfwWQBplB 2XDzG4dNpMn1ShDsEtet7okKJIM1I3Q= X-Google-Smtp-Source: AK7set+B67Bh1dRfeNspsTlJQnRrz9pcEn3pM31L9206j4TGSDjPGmt8U8EHphPWUTTF8vtMoA5vzQ== X-Received: by 2002:a05:600c:35c5:b0:3d2:231a:cb30 with SMTP id r5-20020a05600c35c500b003d2231acb30mr5182214wmq.3.1675793778171; Tue, 07 Feb 2023 10:16:18 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id hg15-20020a05600c538f00b003df7b40f99fsm17363729wmb.11.2023.02.07.10.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:16:17 -0800 (PST) Date: Tue, 7 Feb 2023 19:16:15 +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 AcmHw_ViqEn, AcmHw_VoqEn and ANAPAR_FOR_8192PciE Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename constants AcmHw_ViqEn to ACM_HW_VIQ_EN and AcmHw_VoqEn to ACM_HW_VOQ_EN and ANAPAR_FOR_8192PciE to ANAPAR_FOR_8192PCIE to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index dc6e694840af..cb455969f5dc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -225,11 +225,11 @@ void rtl92e_set_reg(struct net_device *dev, u8 variab= le, u8 *val) break; =20 case AC2_VI: - AcmCtrl |=3D AcmHw_ViqEn; + AcmCtrl |=3D ACM_HW_VIQ_EN; break; =20 case AC3_VO: - AcmCtrl |=3D AcmHw_VoqEn; + AcmCtrl |=3D ACM_HW_VOQ_EN; break; } } else { @@ -239,7 +239,7 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable= , u8 *val) break; =20 case AC2_VI: - AcmCtrl &=3D (~AcmHw_ViqEn); + AcmCtrl &=3D (~ACM_HW_VIQ_EN); break; =20 case AC3_VO: diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/stagin= g/rtl8192e/rtl8192e/r8192E_hw.h index c3b573090d39..1546bb575293 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -144,8 +144,8 @@ enum _RTL8192PCI_HW { #define CPU_GEN_NO_LOOPBACK_SET 0x00080000 ACM_HW_CTRL =3D 0x171, #define ACM_HW_BEQ_EN BIT1 -#define AcmHw_ViqEn BIT2 -#define AcmHw_VoqEn BIT3 +#define ACM_HW_VIQ_EN BIT2 +#define ACM_HW_VOQ_EN BIT3 RQPN1 =3D 0x180, RQPN2 =3D 0x184, RQPN3 =3D 0x188, @@ -250,6 +250,6 @@ enum _RTL8192PCI_HW { =20 #define GPI 0x108 =20 -#define ANAPAR_FOR_8192PciE 0x17 +#define ANAPAR_FOR_8192PCIE 0x17 =20 #endif diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index cbda027656dc..c6cbdea6d5b2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1273,7 +1273,7 @@ void rtl92e_set_rf_off(struct net_device *dev) rtl92e_set_bb_reg(dev, rOFDM1_TRxPathEnable, 0xf, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x60, 0x0); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x4, 0x0); - rtl92e_writeb(dev, ANAPAR_FOR_8192PciE, 0x07); + rtl92e_writeb(dev, ANAPAR_FOR_8192PCIE, 0x07); =20 } =20 --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A805C636D3 for ; Tue, 7 Feb 2023 18:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232130AbjBGSQu (ORCPT ); Tue, 7 Feb 2023 13:16:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232110AbjBGSQg (ORCPT ); Tue, 7 Feb 2023 13:16:36 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2307F3E601 for ; Tue, 7 Feb 2023 10:16:26 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id y1so14455292wru.2 for ; Tue, 07 Feb 2023 10:16:26 -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=U3O/aD4Uv2cETSrvPLtPnBPSmR1X5PU3SN0FZx5rCJs=; b=H46iivmubbNG5bbuSnlVhfSauQ6dL6uQj6DuSUlCCkjOa6nqUuc3TxnMT1KCzkg21N q6QcwCmLYTC3L+s3U24GTq1ONcqZkrrYLB7r9x7e18VE9/wkK4SFrQLkxyrW+Qhvbqlg 3i+CV48cGSDhlzw1GuWlVEd7xnRqKf7bo55Idy8MoZUZ+SRvz9MbuPlseRS3XaxQbi2I 0t4YTNqqLVJyHEKfTyihlwORxT41Qp8Q1Ai7Oq8gtsmh7448nw8lBuZuE1jetCJLwGbK Baz13ZcPVl6plyBYW0+NTSPgpb6Kf3lNj6j745eUHuMQJPwVY+zlT53ecpb+0ZryJbxY jMSg== 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=U3O/aD4Uv2cETSrvPLtPnBPSmR1X5PU3SN0FZx5rCJs=; b=eZQRHQsYlHXtUh7L2Io3rPmne+wWN6KeK2OzpZtmH5GlVIkw+NS9p0n3DDYh/AoJAP zcjanahplW5g5Xnf9/zXl90eiuVFNpnXz9ZWHCVbWt/U/PXJfHv0vADeQhKWIVb19aAU yU8l6S9wjWIJP5u+RGUiW+c55iCoTm8DKkLEXwmU+7WQ8KNtjCTK1vofQ+nW2lCl6yRf OUBvsJaCs3jUHrZGxUCsoiU3nKeb59HQbT/7xHUraOTarIx8/DFvIMEKZUN1QYhqBG1Y soLbgteYiSVifGO1Z99LHwfO7CTEgVwI98zxRaNM+gVnq2Tw+q0dHgPl79XXt8uaLRYB ErGg== X-Gm-Message-State: AO0yUKUW9VrPaRgdO46/20iqP1XOza1Cr9b85W70XoilsTcuMM0GB0gN Y2Qnn8SICijfBf036X7eNbo= X-Google-Smtp-Source: AK7set/44jn5Ep/pwE78uNH5fikW3GqzzST8Vhs3U+5tixpP0gBelHbi1NFKDVEY+2xa3j+uogMtAw== X-Received: by 2002:a05:6000:12cb:b0:2bf:e46c:8b89 with SMTP id l11-20020a05600012cb00b002bfe46c8b89mr2738630wrx.4.1675793784708; Tue, 07 Feb 2023 10:16:24 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id e20-20020a5d5954000000b002bfd524255esm12073035wri.43.2023.02.07.10.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:16:24 -0800 (PST) Date: Tue, 7 Feb 2023 19:16:22 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Calculate definition of MSR_LINK_MASK Message-ID: <8c8a126a83683bae69d0fd20a93bdea8f810f6d0.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Calculate definition of MSR_LINK_MASK ((1<<0)|(1<<1)) =3D 3. Equation is not accepted by checkpatch because of missing spaces. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/stagin= g/rtl8192e/rtl8192e/r8192E_hw.h index 1546bb575293..20a35c9caee8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -170,7 +170,7 @@ enum _RTL8192PCI_HW { #define BW_OPMODE_20MHZ BIT2 IC_VERRSION =3D 0x301, MSR =3D 0x303, -#define MSR_LINK_MASK ((1<<0)|(1<<1)) +#define MSR_LINK_MASK 3 #define MSR_LINK_MANAGED 2 #define MSR_LINK_ADHOC 1 #define MSR_LINK_MASTER 3 --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA1A1C636D3 for ; Tue, 7 Feb 2023 18:17:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232019AbjBGSRB (ORCPT ); Tue, 7 Feb 2023 13:17:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231131AbjBGSQn (ORCPT ); Tue, 7 Feb 2023 13:16:43 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23E0D3E0BF for ; Tue, 7 Feb 2023 10:16:33 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id a2so14166117wrd.6 for ; Tue, 07 Feb 2023 10:16:33 -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=l58QyEwjg2Xy1dv7GkTVk31VP5XTg2OhnS4jifX8Prs=; b=PbsO3vVKh4nkVD89wncFG7mQZnx+UDnqfbc83iB2kYY53j5AhUQZNIg/b0J+gIZ7AS 1LuONgG5BtivtdspzSVh7XvjpjYSIxBCLfAphoqnM1nMMtd2SKe/idVin2J6MxzC/uLo Xbkw17d7kzxnyrHcSsDSEX4V+59SQll4C4yAKwavIagrtOUSO9Qdy5uHkx7Nss2Dp1R1 kxGWv2PS0pwvL56i19PUiqQlV39II+Icxc/ijxAH3D/VxEsBj/WqxZ1p5JsmQO8vhmnx zt9jHsK+wZPmhOerU3T00nIOt3fjP6k3JHfSQb50yvmXFVlzGOzBh2ARVV7Hiyx4WU9V 5dqg== 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=l58QyEwjg2Xy1dv7GkTVk31VP5XTg2OhnS4jifX8Prs=; b=7KsvUNH3/nihuhPLTUxhj3tixGQftZZ4Lz7ZGAaeyJEfnpLpc3W+xyF24/uBANNmwg AhD9Yuzauovv+9KpPPYYK19YTqP++QDDWgN6dkyASAysPbr+1JvrZUn+pCe7uGxUgv5A sw4C2vqqLDm7iGSFU5e2kJYYV6CQnzzuprGVoQeqhdVhUdo+Vhkpmnbtpop4soxDFgQK AIyHANan4LmdVQkAtgEPI+whmAuhwCxOXNATDoJzUlx2rSNRhe5xQ6SuRXbJenjTluK6 9RoMDLc+xuESvVYMI/NqOirL91rSaDLW/dfqzVO7swvTeHpTLhzY9+lbZk8KBMxb3dah rVLg== X-Gm-Message-State: AO0yUKW4tqkg+1EJfdczfV/sVnhuwM2S0KvdnfPCB9fr9F6XcMS673s3 UaT5Kd8RnLjHAQGGFOcMhTM= X-Google-Smtp-Source: AK7set/bCZPKYBKvArbXgoXX89rMDNJeWOsJl4zNpuaB5tkaK+CS+G+vWep+d7xWqqL5rdcsgcLayQ== X-Received: by 2002:a5d:595f:0:b0:2c3:f09f:7991 with SMTP id e31-20020a5d595f000000b002c3f09f7991mr2639411wri.2.1675793791730; Tue, 07 Feb 2023 10:16:31 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id e15-20020a5d65cf000000b002bfc0558ecdsm11693032wrw.113.2023.02.07.10.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:16:31 -0800 (PST) Date: Tue, 7 Feb 2023 19:16:29 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Remove blank lines in r8192E_hw.h, rtl_core.h and .. Message-ID: <9d7d54c5a2cdba6162e38e8d77faca5e5f39bdea.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove or add blank lines in r8192E_hw.h, rtl_core.h and rtl_dm.h so that code fits to kernel coding style as shown by checkpatch. Remove one line break after "}" to fit to kernel coding style. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 5 +---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 3 --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 8 +------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/stagin= g/rtl8192e/rtl8192e/r8192E_hw.h index 20a35c9caee8..75ef179e28c4 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -239,14 +239,11 @@ enum _RTL8192PCI_HW { RATR_MCS11 | RATR_MCS12 | RATR_MCS13 | \ RATR_MCS14|RATR_MCS15) =20 - DRIVER_RSSI =3D 0x32c, MCS_TXAGC =3D 0x340, CCK_TXAGC =3D 0x348, MacBlkCtrl =3D 0x403, - -} -; +}; =20 #define GPI 0x108 =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 17fc69c839d3..fd96eef90c7f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -203,8 +203,6 @@ struct rtl8192_tx_ring { struct sk_buff_head queue; }; =20 - - struct rtl819x_ops { enum nic_t nic_type; void (*get_eeprom_size)(struct net_device *dev); @@ -264,7 +262,6 @@ struct r8192_priv { =20 enum rt_customer_id customer_id; =20 - enum rt_rf_type_819xu rf_chip; enum ht_channel_width current_chnl_bw; struct bb_reg_definition phy_reg_def[4]; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index 7339ce1e40db..a0c4006c7726 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -7,7 +7,6 @@ #ifndef __R8192UDM_H__ #define __R8192UDM_H__ =20 - /*--------------------------Define Parameters-----------------------------= --*/ #define OFDM_Table_Length 19 #define CCK_Table_length 12 @@ -49,7 +48,6 @@ =20 /*--------------------------Define Parameters-----------------------------= --*/ =20 - /*------------------------------Define structure--------------------------= --*/ struct dig_t { u8 dig_enable_flag; @@ -88,7 +86,6 @@ enum dm_dig_sta { DM_STA_DIG_MAX }; =20 - enum dm_ratr_sta { DM_RATR_STA_HIGH =3D 0, DM_RATR_STA_MIDDLE =3D 1, @@ -148,14 +145,13 @@ enum dm_cck_rx_path_method { CCK_Rx_Version_MAX }; =20 - struct dcmd_txcmd { u32 op; u32 length; u32 value; }; -/*------------------------------Define structure--------------------------= --*/ =20 +/*------------------------------Define structure--------------------------= --*/ =20 /*------------------------Export global variable--------------------------= --*/ extern struct dig_t dm_digtable; @@ -170,7 +166,6 @@ extern const u8 dm_cck_tx_bb_gain_ch14[CCK_TX_BB_GAIN_T= ABLE_LEN][8]; =20 /*------------------------Export global variable--------------------------= --*/ =20 - /*--------------------------Exported Function prototype-------------------= --*/ /*--------------------------Exported Function prototype-------------------= --*/ =20 @@ -179,7 +174,6 @@ void rtl92e_dm_deinit(struct net_device *dev); =20 void rtl92e_dm_watchdog(struct net_device *dev); =20 - void rtl92e_init_adaptive_rate(struct net_device *dev); void rtl92e_dm_txpower_tracking_wq(void *data); =20 --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 364B6C636D3 for ; Tue, 7 Feb 2023 18:17:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231248AbjBGSRh (ORCPT ); Tue, 7 Feb 2023 13:17:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232229AbjBGSRQ (ORCPT ); Tue, 7 Feb 2023 13:17:16 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 681ED3CE04 for ; Tue, 7 Feb 2023 10:16:51 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id o18so14447732wrj.3 for ; Tue, 07 Feb 2023 10:16:51 -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=xmsSrOMQzGqTbxYtpsoEwK2HkdTJeu+/aeeH05/7YqA=; b=f+B7pQ4/XQkQ7xXipcWRh+TiWMSG5gm+0GbkQ2PucRVLd5klKA4IccE30Bjb5wfER5 BdfjS7WfwXh3H+5bYEFO8f8bJOVohx3NPUDuTe93N5OoXwXVKUKKtbPIblo5v616vYZI NY6R10SIxVBjSASTKC17GkimZ4C6IeXssgnGvvl+EF3ZEUjHtoZfuhnjJB8Jwwklw9xv qMgYTjxjCuwCHqSu09OEsBRxPmkMqkVIsR4x8Q/2PY4Cfg3oYK2re51nZvQ0gRvjWecY StpRTtcAEsYZNt1jYkKArxXfMMirP5QTgLrCcmFLVSrNYk3oDqDH7q+7VUYrdsK1u9qv T4rA== 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=xmsSrOMQzGqTbxYtpsoEwK2HkdTJeu+/aeeH05/7YqA=; b=sJDZzD7xF1QIXUOzA+wH22pysIvj1xNaHAvqYEw0IV/v28MCVeg4BrwJW23j+ErEOt LCjRvrr+87QxIfbTiH+/jf2hKb7wR9ZKkF6NsOpA6EChaZJR7XkuktDG/Iu90MfzihZA jwPk2gGiGRP2TFQLBKibk1h5/4GSIowW9s4oPh7qiMnnDR7QJul4Zw/CZPU665uqO5Bg SMPzcCKbWIsTsva+zjn+uzMJmGigoATq/63jc3IF1hHWqJONfZCkWXp8lY1QaCb3CfGR nLXI8ikGSmovT0aT4Ttm1l7GYiU9qsBkm50+vINiI4URqUCmomD0rpGLTNAhnPtZRgpJ TGIw== X-Gm-Message-State: AO0yUKUEHnzDzC0Nasffjxmti0maJUC1lnRPg1R1U2STvb7/IbSJTk// VKyyMjeC7Y8RmmUx0GhzBwE= X-Google-Smtp-Source: AK7set+p+fuc0wTbFgAm+jOkR1yU0wq2yXJQnx5Qk4f0KSjukyV/d8krL0ixVB9BOhyK8r62fIe0Cw== X-Received: by 2002:a5d:6707:0:b0:2c3:db5b:7277 with SMTP id o7-20020a5d6707000000b002c3db5b7277mr2621584wru.0.1675793803516; Tue, 07 Feb 2023 10:16:43 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id e2-20020a5d5002000000b002c3be6ae0b1sm11756528wrt.65.2023.02.07.10.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:16:42 -0800 (PST) Date: Tue, 7 Feb 2023 19:16:39 +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 MacBlkCtrl and remove double definition Message-ID: <8c0c46860fdb71660183fce567f7bc80e1d1ad36.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename constant MacBlkCtrl to MAC_BLK_CTRL to avoid CamelCase which is not accepted by checkpatch. Remove double definition. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index cb455969f5dc..a2587300a47a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1861,7 +1861,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool= reset) =20 =20 rtl92e_writeb(dev, PMR, 0x5); - rtl92e_writeb(dev, MacBlkCtrl, 0xa); + rtl92e_writeb(dev, MAC_BLK_CTRL, 0xa); } } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h b/drivers/stagin= g/rtl8192e/rtl8192e/r8192E_hw.h index 75ef179e28c4..795efa8d3181 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h @@ -242,7 +242,7 @@ enum _RTL8192PCI_HW { DRIVER_RSSI =3D 0x32c, MCS_TXAGC =3D 0x340, CCK_TXAGC =3D 0x348, - MacBlkCtrl =3D 0x403, + MAC_BLK_CTRL =3D 0x403, }; =20 #define GPI 0x108 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h b/drivers/st= aging/rtl8192e/rtl8192e/r8192E_phyreg.h index 433272a2aae8..f846f109ed98 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h @@ -42,8 +42,6 @@ #define CCK_TXAGC 0x348 =20 /* Mac block on/off control register */ -#define MacBlkCtrl 0x403 - #define rFPGA0_RFMOD 0x800 /* RF mode & CCK TxSC */ #define rFPGA0_TxInfo 0x804 #define rFPGA0_PSDFunction 0x808 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_pm.c index 82b45c61ac75..9c80dc1b6e12 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c @@ -41,7 +41,7 @@ int rtl92e_suspend(struct device *dev_d) rtl92e_writel(dev, WFCRC1, 0xffffffff); rtl92e_writel(dev, WFCRC2, 0xffffffff); rtl92e_writeb(dev, PMR, 0x5); - rtl92e_writeb(dev, MacBlkCtrl, 0xa); + rtl92e_writeb(dev, MAC_BLK_CTRL, 0xa); } out_pci_suspend: netdev_info(dev, "WOL is %s\n", priv->rtllib->bSupportRemoteWakeUp ? --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89174C636CC for ; Tue, 7 Feb 2023 18:17:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231670AbjBGSRk (ORCPT ); Tue, 7 Feb 2023 13:17:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232257AbjBGSRR (ORCPT ); Tue, 7 Feb 2023 13:17:17 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54F7D3EC5E for ; Tue, 7 Feb 2023 10:16:51 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so13828492wmb.2 for ; Tue, 07 Feb 2023 10:16:51 -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=dRXlbuHWIqEI2LZL4Y/EiSrD0H+SiFzYSzy68+DpRcI=; b=AvFAsLg76DNcqBL5Ki9pWEbflh5k18Z9it0vGcETw+2Hw17NsmeXaTnnbJb0vgeC7x OaII1I4jEhMMv+p81cDzt6JVm9Eb8bzf9pKjGFAWqpHvChUcAAsO7OhGsJGcU/fiIA2t JxdVhqua+VpEFXqnzqQVdoRdlGe3jbL5s1fi77GpGSrkn2erSUFUp2QVxudXZhPmq/HG vAkuhg6wb3zgdj3/9YRcj9UnOGWcXpDD/gGyICzyp9Vp8v1zLcojo2oJSRIwJfFSLPUr RUJOCCUyIK0eTt3gFK2vxaASBPNTLOPkBBRaPZmeA8LvOrJcGPvEHKjr1DrrAhdPjUol WTSw== 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=dRXlbuHWIqEI2LZL4Y/EiSrD0H+SiFzYSzy68+DpRcI=; b=iCB2Sr+bXmdhqN7kUhI1TAhPXdSErJgGoHtT8AGSmt8E+4FajJKcud4cIBds92Gyky QaWwDSFmw8RLBFKimURo2ypcIgLxyQPcRgLG+BNdkSPqR2FcIkqMsZhypFZZwW4a2r4K 4mjiJxsLgIyJnjpETqkK4dw3RAUBUtcLwAV1+3+80/k2Okz8XQ0Lq0t7vmThnksO1+Xp 5tuPSeuGvN7rk0ha6FnUyIxXFBfsn9ElLwpGpRUPt4JSmZK7LU6+zcMOd10ONI0FX00n 13LKJ4jp4v69nZoVV5eUCeV1uTma8WgPVwqTvFog/ltTI37FeNDTVB/VQ4UkSbmv0XK0 GM4w== X-Gm-Message-State: AO0yUKWpS9VIdzSaDsL3BwmWgX6YJ/D73NEoQbvyeB+FxzLUS3jFm5ZH evmSLJpjEVIe8X8BCw+hM4s= X-Google-Smtp-Source: AK7set8yJYJ1txXDOyS9E2+5Baq4azg1KX5SHxPfKMUj5bTiFlyAO6J5FpGbSQUYH9lEmbwl6nK/WA== X-Received: by 2002:a05:600c:511c:b0:3dc:3398:cf65 with SMTP id o28-20020a05600c511c00b003dc3398cf65mr4841197wms.2.1675793809441; Tue, 07 Feb 2023 10:16:49 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id ip20-20020a05600ca69400b003dd19baf45asm13784914wmb.40.2023.02.07.10.16.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:16:48 -0800 (PST) Date: Tue, 7 Feb 2023 19:16:47 +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 OFDM_Table.., CCK_Table_.. and RxPathSelecti.. Message-ID: <197e98073922ec14d56e4a516c493188c88e11c1.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename constants OFDM_Table_Length to OFDM_TABLE_LEN, CCK_Table_length to CCK_TABLE_LEN and RxPathSelection_SS_TH_low to RX_PATH_SEL_SS_TH_LOW to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 24 +++++++++++----------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 5d77baf7df64..40e6194c6687 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -455,7 +455,7 @@ static void _rtl92e_dm_bandwidth_autoswitch(struct net_= device *dev) } } =20 -static u32 OFDMSwingTable[OFDM_Table_Length] =3D { +static u32 OFDMSwingTable[OFDM_TABLE_LEN] =3D { 0x7f8001fe, 0x71c001c7, 0x65400195, @@ -477,7 +477,7 @@ static u32 OFDMSwingTable[OFDM_Table_Length] =3D { 0x10000040 }; =20 -static u8 CCKSwingTable_Ch1_Ch13[CCK_Table_length][8] =3D { +static u8 CCKSwingTable_Ch1_Ch13[CCK_TABLE_LEN][8] =3D { {0x36, 0x35, 0x2e, 0x25, 0x1c, 0x12, 0x09, 0x04}, {0x30, 0x2f, 0x29, 0x21, 0x19, 0x10, 0x08, 0x03}, {0x2b, 0x2a, 0x25, 0x1e, 0x16, 0x0e, 0x07, 0x03}, @@ -492,7 +492,7 @@ static u8 CCKSwingTable_Ch1_Ch13[CCK_Table_length][8] = =3D { {0x0f, 0x0f, 0x0d, 0x0b, 0x08, 0x05, 0x03, 0x01} }; =20 -static u8 CCKSwingTable_Ch14[CCK_Table_length][8] =3D { +static u8 CCKSwingTable_Ch14[CCK_TABLE_LEN][8] =3D { {0x36, 0x35, 0x2e, 0x1b, 0x00, 0x00, 0x00, 0x00}, {0x30, 0x2f, 0x29, 0x18, 0x00, 0x00, 0x00, 0x00}, {0x2b, 0x2a, 0x25, 0x15, 0x00, 0x00, 0x00, 0x00}, @@ -771,13 +771,13 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(s= truct net_device *dev) if (!priv->tx_pwr_tracking_init) { tmpRegA =3D rtl92e_get_bb_reg(dev, rOFDM0_XATxIQImbalance, bMaskDWord); - for (i =3D 0; i < OFDM_Table_Length; i++) { + for (i =3D 0; i < OFDM_TABLE_LEN; i++) { if (tmpRegA =3D=3D OFDMSwingTable[i]) priv->ofdm_index[0] =3D i; } =20 TempCCk =3D rtl92e_get_bb_reg(dev, rCCK0_TxFilter1, bMaskByte2); - for (i =3D 0; i < CCK_Table_length; i++) { + for (i =3D 0; i < CCK_TABLE_LEN; i++) { if (TempCCk =3D=3D (u32)CCKSwingTable_Ch1_Ch13[i][0]) { priv->cck_index =3D i; break; @@ -799,12 +799,12 @@ static void _rtl92e_dm_tx_power_tracking_cb_thermal(s= truct net_device *dev) tmpOFDMindex =3D tmpCCK20Mindex =3D 6+(priv->thermal_meter[0] - (u8)tmpRegA); tmpCCK40Mindex =3D tmpCCK20Mindex - 6; - if (tmpOFDMindex >=3D OFDM_Table_Length) - tmpOFDMindex =3D OFDM_Table_Length-1; - if (tmpCCK20Mindex >=3D CCK_Table_length) - tmpCCK20Mindex =3D CCK_Table_length-1; - if (tmpCCK40Mindex >=3D CCK_Table_length) - tmpCCK40Mindex =3D CCK_Table_length-1; + if (tmpOFDMindex >=3D OFDM_TABLE_LEN) + tmpOFDMindex =3D OFDM_TABLE_LEN - 1; + if (tmpCCK20Mindex >=3D CCK_TABLE_LEN) + tmpCCK20Mindex =3D CCK_TABLE_LEN - 1; + if (tmpCCK40Mindex >=3D CCK_TABLE_LEN) + tmpCCK40Mindex =3D CCK_TABLE_LEN - 1; } else { tmpval =3D (u8)tmpRegA - priv->thermal_meter[0]; if (tmpval >=3D 6) { @@ -1732,7 +1732,7 @@ static void _rtl92e_dm_init_rx_path_selection(struct = net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); =20 DM_RxPathSelTable.Enable =3D 1; - DM_RxPathSelTable.SS_TH_low =3D RxPathSelection_SS_TH_low; + DM_RxPathSelTable.SS_TH_low =3D RX_PATH_SEL_SS_TH_LOW; DM_RxPathSelTable.diff_TH =3D RxPathSelection_diff_TH; if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index a0c4006c7726..c41490850713 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -8,8 +8,8 @@ #define __R8192UDM_H__ =20 /*--------------------------Define Parameters-----------------------------= --*/ -#define OFDM_Table_Length 19 -#define CCK_Table_length 12 +#define OFDM_TABLE_LEN 19 +#define CCK_TABLE_LEN 12 =20 #define DM_DIG_THRESH_HIGH 40 #define DM_DIG_THRESH_LOW 35 @@ -25,7 +25,7 @@ #define DM_DIG_MIN 0x1c #define DM_DIG_MIN_Netcore 0x12 =20 -#define RxPathSelection_SS_TH_low 30 +#define RX_PATH_SEL_SS_TH_LOW 30 #define RxPathSelection_diff_TH 18 =20 #define RateAdaptiveTH_High 50 --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2782AC636CC for ; Tue, 7 Feb 2023 18:17:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbjBGSRm (ORCPT ); Tue, 7 Feb 2023 13:17:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231843AbjBGSRW (ORCPT ); Tue, 7 Feb 2023 13:17:22 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E5543EC65 for ; Tue, 7 Feb 2023 10:17:01 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id l37-20020a05600c1d2500b003dfe46a9801so10684003wms.0 for ; Tue, 07 Feb 2023 10:17: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=doEhSZ1ZWSbiqK6262/Gppr2vN+zJ+4OHWK0fM/t0m4=; b=qAxhseizMgzVK8VNabQYUHFA3ziy/vYcvzH8KWSUsaUo3DYLl1shUNE+sr+2fzRmH7 KYKS4lnpBTjhYII9b/fK1L/Aemdod+1Gm9WSIp0/96YUkbM3r5hSxXBqF9ed4GblzWLa panLNSe+F53DdZQ0jltsFTUhbXyDPlygRpi3twccEV9tF5ChjncnM25l7/P0CvsBeqL3 vbySATfC57/aO5KHGy8ghTZsVtravMlSGaCE+FQS7Pdm7fjUEWVvlOwITmEbx2Ntl6I4 MPIex30S99clE+DnLpMHvGEfp5HBYbn7+8u87USQuIFLf58VQewbklnaPiiO2razeOE8 3gYQ== 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=doEhSZ1ZWSbiqK6262/Gppr2vN+zJ+4OHWK0fM/t0m4=; b=TEBxzLnG4qLYlsgWk1uLomZdyJjKMF2LUB2920mKQAlwrPl8/qbKBdzqbESRAVRKN4 M3wRwBmhaGQIyL2bDPNRTSOzT3uE9MkQmADeoVLiqrme/fHXXB/1camPSFPE9tsCeIMs sgV5NWEOTPZAZv+TR0hOKhNH4EqHUGx6KbbEGiArh4p75zyUIvGBCDZ5G6upMrvPmpQv Gr98DhzoiE+BCXVRtRBwawtB0f9KNKJUvnolq9aNS41VEsuZewA5Pew6q876C0D9Bdav dCIFD7MkURDy3NkNXwpgQKBwtrTNCgTQVbvSmZfKJ/GuHUUIQGG8o8OaJsAPAeHdPcZ6 I5xA== X-Gm-Message-State: AO0yUKXKXyP9/dNdvV341xigr/lpk/2tKEoQ3diwBx+az9M31C3kmrBV z6SdRuC+gpMYgdfht/Ymf08CvOB9uf4= X-Google-Smtp-Source: AK7set9Nz/9NyyHVkS+wJWMskZhfFaxuUgxeV0zGY79BnbchMKm3M1HjI23WwasptuaSS2XNOR8SEg== X-Received: by 2002:a05:600c:3b9d:b0:3dc:54da:ba3e with SMTP id n29-20020a05600c3b9d00b003dc54daba3emr4837964wms.3.1675793815912; Tue, 07 Feb 2023 10:16:55 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id x14-20020a5d650e000000b002c3f0e94e94sm3019066wru.14.2023.02.07.10.16.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:16:55 -0800 (PST) Date: Tue, 7 Feb 2023 19:16:53 +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 RxPathSelectio.., RateAdaptive.. and RateAdap.. Message-ID: <3fb44a7f8020b898d3f589f16e9be4f555aa9e1e.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename constants RxPathSelection_diff_TH to RX_PATH_SEL_DIFF_TH, RateAdaptiveTH_High to RATE_ADAPTIVE_TH_HIGH and RateAdaptiveTH_Low_20M to RATE_ADAPTIVE_TH_LOW_20M 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/rtl_dm.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index a2587300a47a..7e445a168daa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -2017,20 +2017,20 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) u8 SilentResetRxSoltNum =3D 4; =20 rx_chk_cnt++; - if (priv->undecorated_smoothed_pwdb >=3D (RateAdaptiveTH_High+5)) { + if (priv->undecorated_smoothed_pwdb >=3D (RATE_ADAPTIVE_TH_HIGH + 5)) { rx_chk_cnt =3D 0; - } else if ((priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High + 5)) + } else if ((priv->undecorated_smoothed_pwdb < (RATE_ADAPTIVE_TH_HIGH + 5)) && (((priv->current_chnl_bw !=3D HT_CHANNEL_WIDTH_20) && (priv->undecorated_smoothed_pwdb >=3D RateAdaptiveTH_Low_40M)) || ((priv->current_chnl_bw =3D=3D HT_CHANNEL_WIDTH_20) && - (priv->undecorated_smoothed_pwdb >=3D RateAdaptiveTH_Low_20M)))) { + (priv->undecorated_smoothed_pwdb >=3D RATE_ADAPTIVE_TH_LOW_20M)))) { if (rx_chk_cnt < 2) return bStuck; rx_chk_cnt =3D 0; } else if ((((priv->current_chnl_bw !=3D HT_CHANNEL_WIDTH_20) && (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) || ((priv->current_chnl_bw =3D=3D HT_CHANNEL_WIDTH_20) && - (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_20M))) && + (priv->undecorated_smoothed_pwdb < RATE_ADAPTIVE_TH_LOW_20M))) && priv->undecorated_smoothed_pwdb >=3D VeryLowRSSI) { if (rx_chk_cnt < 4) return bStuck; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 40e6194c6687..739f7c512831 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -282,12 +282,12 @@ void rtl92e_init_adaptive_rate(struct net_device *dev) struct rate_adaptive *pra =3D &priv->rate_adaptive; =20 pra->ratr_state =3D DM_RATR_STA_MAX; - pra->high2low_rssi_thresh_for_ra =3D RateAdaptiveTH_High; - pra->low2high_rssi_thresh_for_ra20M =3D RateAdaptiveTH_Low_20M+5; + pra->high2low_rssi_thresh_for_ra =3D RATE_ADAPTIVE_TH_HIGH; + pra->low2high_rssi_thresh_for_ra20M =3D RATE_ADAPTIVE_TH_LOW_20M + 5; pra->low2high_rssi_thresh_for_ra40M =3D RateAdaptiveTH_Low_40M+5; =20 - pra->high_rssi_thresh_for_ra =3D RateAdaptiveTH_High+5; - pra->low_rssi_thresh_for_ra20M =3D RateAdaptiveTH_Low_20M; + pra->high_rssi_thresh_for_ra =3D RATE_ADAPTIVE_TH_HIGH + 5; + pra->low_rssi_thresh_for_ra20M =3D RATE_ADAPTIVE_TH_LOW_20M; pra->low_rssi_thresh_for_ra40M =3D RateAdaptiveTH_Low_40M; =20 if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) @@ -1733,7 +1733,7 @@ static void _rtl92e_dm_init_rx_path_selection(struct = net_device *dev) =20 DM_RxPathSelTable.Enable =3D 1; DM_RxPathSelTable.SS_TH_low =3D RX_PATH_SEL_SS_TH_LOW; - DM_RxPathSelTable.diff_TH =3D RxPathSelection_diff_TH; + DM_RxPathSelTable.diff_TH =3D RX_PATH_SEL_DIFF_TH; if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; else diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index c41490850713..ea698e894146 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -26,10 +26,10 @@ #define DM_DIG_MIN_Netcore 0x12 =20 #define RX_PATH_SEL_SS_TH_LOW 30 -#define RxPathSelection_diff_TH 18 +#define RX_PATH_SEL_DIFF_TH 18 =20 -#define RateAdaptiveTH_High 50 -#define RateAdaptiveTH_Low_20M 30 +#define RATE_ADAPTIVE_TH_HIGH 50 +#define RATE_ADAPTIVE_TH_LOW_20M 30 #define RateAdaptiveTH_Low_40M 10 #define VeryLowRSSI 15 =20 --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20B74C636D3 for ; Tue, 7 Feb 2023 18:17:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229679AbjBGSRz (ORCPT ); Tue, 7 Feb 2023 13:17:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230048AbjBGSR2 (ORCPT ); Tue, 7 Feb 2023 13:17:28 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C51053EC6B for ; Tue, 7 Feb 2023 10:17:04 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id o36so11671939wms.1 for ; Tue, 07 Feb 2023 10:17:04 -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=WGwqZUsDnGRvbERNE55E/iqBGAJKPmXKHucUfptNjuE=; b=g4cKbTwaTW/Mk5IWf4FL266QBdQso0Ex5EBXUrFXqWcrYoNG/HcXJ68UIrAMBSWqHG sKj1UWvYDrOKvNxXGJZp8u4Ezt5d/ibzzo1qwq6zuXXXDXHiL9wwHm5X9vKLJarNwA5Q vSPYKgURQ3gDIiPq2cHtCEG/s1cekORMmz2oplfXRgmq1JqVnHxnPmeY+LDIYWNR5YYi qOBX0Gz9qZtYYpRLjvNHynjS5V1lOZH797bRdUU3roBukgckqqi3W1bU+BMaAyxJcU4a GWSd86LUDgYDyF2lZFWlluqU5k3WtliPorl2WZtNnUFSARTrvRgWGUoXY1/0p0eK0QM+ ju5g== 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=WGwqZUsDnGRvbERNE55E/iqBGAJKPmXKHucUfptNjuE=; b=m/dUAYox7HIT9KF/CyHZAP/6FbfcVXz+/CSIVsLrQh6F5OMDRIWdr3AmzD+XrkQtQM deNmqdrbD56M5U3lJBTtCdcoN4RISuhI0BobGZ4kJIh1uZr13P2+wETT3OEJ7AwZGzfU 82ADmbd6Rqv2AuksfwgCBN9aahK0jdbIunehsR/+MtJ+mFatV51UomAwjWGvjRz98fAM YPEa+42Tq92UEZLB25MHovYefTMO7Gsx4tt/e2diYkTEbiv9dbKk/X7DoTnhhmssRl59 O8NAAnsIm83expjzzDSknhRVmXXvKF+xNHAQbe3Dvt7SupTaXCB/etc/NTHsqy7mm31U pvRw== X-Gm-Message-State: AO0yUKXjP1K4mpp+biB/f3qZU81G8z7ZDGvAZ7H+4MFO+afUQVjbAKjQ 8oCqV3C3MhzCJeDAgMG5E3c= X-Google-Smtp-Source: AK7set9FfqUA9hTHe2Ir6IOwB6OVABkct9dUWH3zjza2f7QZbPKgi87IEl2HI+d+Q5C4YMCZKSDvHQ== X-Received: by 2002:a05:600c:35c5:b0:3d2:231a:cb30 with SMTP id r5-20020a05600c35c500b003d2231acb30mr5185165wmq.3.1675793823149; Tue, 07 Feb 2023 10:17:03 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id r12-20020a05600c35cc00b003d9fba3c7a4sm21260423wmq.16.2023.02.07.10.17.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:17:02 -0800 (PST) Date: Tue, 7 Feb 2023 19:17:00 +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 RateAdaptiveTH.., VeryLowRSSI and WAIotTHVal Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename constants RateAdaptiveTH_Low_40M to RATE_ADAPTIVE_TH_LOW_40M, VeryLowRSSI to VERY_LOW_RSSI and WAIotTHVal to WA_IOT_TH_VAL to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 7e445a168daa..0b5b2ae27f9e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -2021,17 +2021,17 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) rx_chk_cnt =3D 0; } else if ((priv->undecorated_smoothed_pwdb < (RATE_ADAPTIVE_TH_HIGH + 5)) && (((priv->current_chnl_bw !=3D HT_CHANNEL_WIDTH_20) && - (priv->undecorated_smoothed_pwdb >=3D RateAdaptiveTH_Low_40M)) + (priv->undecorated_smoothed_pwdb >=3D RATE_ADAPTIVE_TH_LOW_40M)) || ((priv->current_chnl_bw =3D=3D HT_CHANNEL_WIDTH_20) && (priv->undecorated_smoothed_pwdb >=3D RATE_ADAPTIVE_TH_LOW_20M)))) { if (rx_chk_cnt < 2) return bStuck; rx_chk_cnt =3D 0; } else if ((((priv->current_chnl_bw !=3D HT_CHANNEL_WIDTH_20) && - (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) || + (priv->undecorated_smoothed_pwdb < RATE_ADAPTIVE_TH_LOW_40M)) || ((priv->current_chnl_bw =3D=3D HT_CHANNEL_WIDTH_20) && (priv->undecorated_smoothed_pwdb < RATE_ADAPTIVE_TH_LOW_20M))) && - priv->undecorated_smoothed_pwdb >=3D VeryLowRSSI) { + priv->undecorated_smoothed_pwdb >=3D VERY_LOW_RSSI) { if (rx_chk_cnt < 4) return bStuck; rx_chk_cnt =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 739f7c512831..55e03eaf9219 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -284,11 +284,11 @@ void rtl92e_init_adaptive_rate(struct net_device *dev) pra->ratr_state =3D DM_RATR_STA_MAX; pra->high2low_rssi_thresh_for_ra =3D RATE_ADAPTIVE_TH_HIGH; pra->low2high_rssi_thresh_for_ra20M =3D RATE_ADAPTIVE_TH_LOW_20M + 5; - pra->low2high_rssi_thresh_for_ra40M =3D RateAdaptiveTH_Low_40M+5; + pra->low2high_rssi_thresh_for_ra40M =3D RATE_ADAPTIVE_TH_LOW_40M + 5; =20 pra->high_rssi_thresh_for_ra =3D RATE_ADAPTIVE_TH_HIGH + 5; pra->low_rssi_thresh_for_ra20M =3D RATE_ADAPTIVE_TH_LOW_20M; - pra->low_rssi_thresh_for_ra40M =3D RateAdaptiveTH_Low_40M; + pra->low_rssi_thresh_for_ra40M =3D RATE_ADAPTIVE_TH_LOW_40M; =20 if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) pra->ping_rssi_enable =3D 1; @@ -1649,7 +1649,7 @@ static void _rtl92e_dm_init_wa_broadcom_iot(struct ne= t_device *dev) struct rt_hi_throughput *ht_info =3D priv->rtllib->ht_info; =20 ht_info->bWAIotBroadcom =3D false; - ht_info->WAIotTH =3D WAIotTHVal; + ht_info->WAIotTH =3D WA_IOT_TH_VAL; } =20 static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index ea698e894146..86974abea19c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -30,10 +30,10 @@ =20 #define RATE_ADAPTIVE_TH_HIGH 50 #define RATE_ADAPTIVE_TH_LOW_20M 30 -#define RateAdaptiveTH_Low_40M 10 -#define VeryLowRSSI 15 +#define RATE_ADAPTIVE_TH_LOW_40M 10 +#define VERY_LOW_RSSI 15 =20 -#define WAIotTHVal 25 +#define WA_IOT_TH_VAL 25 =20 #define E_FOR_TX_POWER_TRACK 300 #define TX_POWER_NEAR_FIELD_THRESH_HIGH 68 --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 635B6C636D3 for ; Tue, 7 Feb 2023 18:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232065AbjBGSSF (ORCPT ); Tue, 7 Feb 2023 13:18:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231927AbjBGSRc (ORCPT ); Tue, 7 Feb 2023 13:17:32 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D333EC69 for ; Tue, 7 Feb 2023 10:17:11 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id u10so8608660wmj.3 for ; Tue, 07 Feb 2023 10:17:11 -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=i70DTnDEYlAPFNMlsy77ER5Ex4KrEjMwWGefFgQrQXI=; b=PyWvU7nUk2rGi22Zc5hlgfbaq38OGk+lrbZrXef06Pf0n283Ees61QTioCzRNMmVYC vUtQPFICskJtu5vnsMbQMLg2ESOyNUL/PR2DUpPSpBUVjzuM+WL58n93hjUMkS+q1QP5 QMHj43kBMyTnWJ1GlEk1a9g/KspmfdQoVOSC+QkNfAo0AD77SsjmzdO4bhncJvZDyLBP hLfQRG/RcyY6lENvAfBFCWr4N5h+hqj1VB+b/P7biV+1QOAZoYM5Xys4mYdsuT3Mregp PTnAEd0Up2WigfNhHVTWE2mDGTMUSibYk61cgAfhMuNm3M1gBK29MI5v+/6QWsNKSXIt 4ITw== 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=i70DTnDEYlAPFNMlsy77ER5Ex4KrEjMwWGefFgQrQXI=; b=0YDiV58OanD0Oe4njimeDBRY8+fhKneqhTeTiibQ0Zy1MjLmPfSbhmXNf6luGpqqq4 0E0hk4xARMyX3ERuLbylwOPXaKzAJQUt5Es+Up84+kmYWuOdYdJz3vgtG0uSAaGoCS2Z qA5VN9i7ZeLLzF8B2UgYvOJa6NvVORdgr7j5jtI18rMI2Irlcuulfgg51i4AEZqyWwo/ qEIZPpDJyaGRdbG1dV1+BmFTUGcJx3YHju43ZjMnli9+swp/CAJWBA48XgQvOkW5sooH n757P6qZPkUy2eToLnuwkp/WddF8PrXJEvL61NSxbKexAah6EazH6GlHX+0KFeWJCQqi Q0GQ== X-Gm-Message-State: AO0yUKXBMlsUPXbyz3xPe6nJzGYpvlfA6mIphaPgTSGazVCzNOVJsG7W kt7+TK5WUEE2jGZjt4PYWFDZd55wH9c= X-Google-Smtp-Source: AK7set8tFu75GALUJtIt9nqTGUR3s1qDUrafgpvKFIxSk1/S4omOLfCGJh0pNgB8HYq/UUo1h7gdCw== X-Received: by 2002:a05:600c:1d06:b0:3db:2063:425e with SMTP id l6-20020a05600c1d0600b003db2063425emr4689402wms.1.1675793829439; Tue, 07 Feb 2023 10:17:09 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id g10-20020a05600c310a00b003de77597f16sm15428928wmo.21.2023.02.07.10.17.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:17:08 -0800 (PST) Date: Tue, 7 Feb 2023 19:17:07 +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 Enable, cck_Rx_path and SS_TH_low Message-ID: <740487e2fd8b98bfcaa8af2e398b9aa7e320fef8.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variables Enable to enable, cck_Rx_path to cck_rx_path and SS_TH_low to ss_th_low to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 55e03eaf9219..5e9a0e9653de 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1720,7 +1720,7 @@ void rtl92e_dm_rf_pathcheck_wq(void *data) else priv->brfpath_rxenable[i] =3D false; } - if (!DM_RxPathSelTable.Enable) + if (!DM_RxPathSelTable.enable) return; =20 _rtl92e_dm_rx_path_sel_byrssi(dev); @@ -1731,8 +1731,8 @@ static void _rtl92e_dm_init_rx_path_selection(struct = net_device *dev) u8 i; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - DM_RxPathSelTable.Enable =3D 1; - DM_RxPathSelTable.SS_TH_low =3D RX_PATH_SEL_SS_TH_LOW; + DM_RxPathSelTable.enable =3D 1; + DM_RxPathSelTable.ss_th_low =3D RX_PATH_SEL_SS_TH_LOW; DM_RxPathSelTable.diff_TH =3D RX_PATH_SEL_DIFF_TH; if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; @@ -1769,7 +1769,7 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_= device *dev) return; =20 if (!cck_Rx_Path_initialized) { - DM_RxPathSelTable.cck_Rx_path =3D (rtl92e_readb(dev, 0xa07)&0xf); + DM_RxPathSelTable.cck_rx_path =3D (rtl92e_readb(dev, 0xa07)&0xf); cck_Rx_Path_initialized =3D 1; } =20 @@ -1901,7 +1901,7 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_= device *dev) update_cck_rx_path =3D 1; } =20 - if (tmp_min_rssi < DM_RxPathSelTable.SS_TH_low && disabled_rf_cnt < 2) { + if (tmp_min_rssi < DM_RxPathSelTable.ss_th_low && disabled_rf_cnt < 2) { if ((tmp_max_rssi - tmp_min_rssi) >=3D DM_RxPathSelTable.diff_TH) { DM_RxPathSelTable.rf_enable_rssi_th[min_rssi_index] =3D @@ -1921,10 +1921,10 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct ne= t_device *dev) } =20 if (update_cck_rx_path) { - DM_RxPathSelTable.cck_Rx_path =3D (cck_default_Rx<<2) | + DM_RxPathSelTable.cck_rx_path =3D (cck_default_Rx<<2) | (cck_optional_Rx); rtl92e_set_bb_reg(dev, rCCK0_AFESetting, 0x0f000000, - DM_RxPathSelTable.cck_Rx_path); + DM_RxPathSelTable.cck_rx_path); } =20 if (DM_RxPathSelTable.disabledRF) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index 86974abea19c..a9fa984c25ac 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -125,11 +125,11 @@ enum dm_dig_cs_ratio { }; =20 struct drx_path_sel { - u8 Enable; + u8 enable; u8 cck_method; - u8 cck_Rx_path; + u8 cck_rx_path; =20 - u8 SS_TH_low; + u8 ss_th_low; u8 diff_TH; u8 disabledRF; u8 reserved; --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E58BC636D4 for ; Tue, 7 Feb 2023 18:18:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231558AbjBGSSI (ORCPT ); Tue, 7 Feb 2023 13:18:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232109AbjBGSRf (ORCPT ); Tue, 7 Feb 2023 13:17:35 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4EED3B0F3 for ; Tue, 7 Feb 2023 10:17:19 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id u10so8608966wmj.3 for ; Tue, 07 Feb 2023 10:17:19 -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=p3HK2Y0LG1NQWI87IVm7GfhefNnAh5k+/ABvdKRfjFo=; b=cybvnBPiPauEWITYLfCHY0LN8tvTQQ8oQRU/yu3Of6VFsWKxn2GkiepP66EasbFI9S qbU/ouqaXYlke0hCL65o9zSlZew5gpsxaIF9aEz7GCyU8iGNuHRBIZhyz/izEf4lnauV HaibjChZSUxHY9oq35PHl0PTcQnZqZD0R5CeOiWgM9KUI8bLTe0zdLhFzj64OHzixZKK KIYpuWR50vzFJdQBYJmCY8Y1kbTpcZ95TElmVxy1aiJCNkkPInoSD9Qpu9kepg2d4AW8 0XlbTEbCc2QWMJ12sXj/QDuP+JZeC2S8gEa/DJ9jZx0U/4+ETuOqj+26UgBoiUq4et21 PgTQ== 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=p3HK2Y0LG1NQWI87IVm7GfhefNnAh5k+/ABvdKRfjFo=; b=QXvU3JpmNgojpAtGvcB5QbtQx1x0bJsB3mY4uHzCbbTfj5EJlH2JgondN/kZlsGw6W no0I/bCb+Rw6Dy7KP7tDXAA+lhgc7PWU3lx4nCmRTYNdpucTAsPAyVpkGfbbHkRLEUlC TFI210w0rkR+fnoVUOmNA0zIF3u3GUVb9epVTwVrZIvcbY5cMw78qhW2/FLEdGuu/IGP 50hJPvahxa9jYy96cXHL56a7yfZ/fXXdq/MO/IbFlbCXT+K99QbOSAswsXPNiF/HVULb /smliC8IcrgPKkjrIuDvM9edH/Uzw13P/DLt7VGMOOyOnMChBGqGrf3h20RAAgT1Gum5 5sPg== X-Gm-Message-State: AO0yUKUpT/INQ4SBmoDeyb8LObZ4pP9YoTvNzG9TkZBrvvPipVNR9zfn 8yKTcbXbbxIFp4WDFXZIyhARNq0WxbM= X-Google-Smtp-Source: AK7set/hLQGnN/cGBokuzI5GR+W4Po7BVsvAJa0drsRzFUBUzNoROTd6D/YtyAvTwRebk3BMsH/xFQ== X-Received: by 2002:a05:600c:3106:b0:3dd:1cd3:5d75 with SMTP id g6-20020a05600c310600b003dd1cd35d75mr4899140wmo.0.1675793837184; Tue, 07 Feb 2023 10:17:17 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id f9-20020a05600c44c900b003dc4fd6e624sm7726803wmo.19.2023.02.07.10.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:17:16 -0800 (PST) Date: Tue, 7 Feb 2023 19:17:15 +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 diff_TH and disabledRF Message-ID: <2b95586ed460f90c98721a429aced1ffaf258e49.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variables diff_TH to diff_th and disabledRF to disabled_rf to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 5e9a0e9653de..911cfecd50cb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1733,12 +1733,12 @@ static void _rtl92e_dm_init_rx_path_selection(struc= t net_device *dev) =20 DM_RxPathSelTable.enable =3D 1; DM_RxPathSelTable.ss_th_low =3D RX_PATH_SEL_SS_TH_LOW; - DM_RxPathSelTable.diff_TH =3D RX_PATH_SEL_DIFF_TH; + DM_RxPathSelTable.diff_th =3D RX_PATH_SEL_DIFF_TH; if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; else DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_1; - DM_RxPathSelTable.disabledRF =3D 0; + DM_RxPathSelTable.disabled_rf =3D 0; for (i =3D 0; i < 4; i++) { DM_RxPathSelTable.rf_rssi[i] =3D 50; DM_RxPathSelTable.cck_pwdb_sta[i] =3D -64; @@ -1773,8 +1773,8 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_= device *dev) cck_Rx_Path_initialized =3D 1; } =20 - DM_RxPathSelTable.disabledRF =3D 0xf; - DM_RxPathSelTable.disabledRF &=3D ~(rtl92e_readb(dev, 0xc04)); + DM_RxPathSelTable.disabled_rf =3D 0xf; + DM_RxPathSelTable.disabled_rf &=3D ~(rtl92e_readb(dev, 0xc04)); =20 if (priv->rtllib->mode =3D=3D WIRELESS_MODE_B) DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; @@ -1903,7 +1903,7 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_= device *dev) =20 if (tmp_min_rssi < DM_RxPathSelTable.ss_th_low && disabled_rf_cnt < 2) { if ((tmp_max_rssi - tmp_min_rssi) >=3D - DM_RxPathSelTable.diff_TH) { + DM_RxPathSelTable.diff_th) { DM_RxPathSelTable.rf_enable_rssi_th[min_rssi_index] =3D tmp_max_rssi+5; rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable, @@ -1927,9 +1927,9 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct net_= device *dev) DM_RxPathSelTable.cck_rx_path); } =20 - if (DM_RxPathSelTable.disabledRF) { + if (DM_RxPathSelTable.disabled_rf) { for (i =3D 0; i < 4; i++) { - if ((DM_RxPathSelTable.disabledRF>>i) & 0x1) { + if ((DM_RxPathSelTable.disabled_rf >> i) & 0x1) { if (tmp_max_rssi >=3D DM_RxPathSelTable.rf_enable_rssi_th[i]) { rtl92e_set_bb_reg(dev, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index a9fa984c25ac..1c2eb7ac52ce 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -130,8 +130,8 @@ struct drx_path_sel { u8 cck_rx_path; =20 u8 ss_th_low; - u8 diff_TH; - u8 disabledRF; + u8 diff_th; + u8 disabled_rf; u8 reserved; =20 u8 rf_rssi[4]; --=20 2.39.1 From nobody Fri Sep 12 19:58:19 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 953BCC636D4 for ; Tue, 7 Feb 2023 18:18:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232166AbjBGSSd (ORCPT ); Tue, 7 Feb 2023 13:18:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232185AbjBGSRw (ORCPT ); Tue, 7 Feb 2023 13:17:52 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C25383C2A3 for ; Tue, 7 Feb 2023 10:17:26 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id bg5-20020a05600c3c8500b003e00c739ce4so3526685wmb.5 for ; Tue, 07 Feb 2023 10:17:26 -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=HTiF0YIa3PdrY6tKdiAmvkQYvcKnR6W7qr1uTcPoR/g=; b=E28KMjB6gPE5bfO5zuiBwwhmm3qDhLnvhlfgqmaoOvtQ3CqIBV4visKND1+YBY3jgY 5jF82T5SFlKukUcRjsJj0dsHFO7LUyvljttMlNbOCsKb4eNeM8Jn7Etfo8lDP97VPgBQ rSd/w+DXXAnZatMok8RKFMebVe97pDWSGg3uNOMyezOfHlJezJY+Jo7/1mUxhrJZmOJw bXO+JgiZw0OUZn9G43vbaHpO+R9zpg9v2Bf1LOhkGcbZVB71P3LPbOCYHU05ZLQ6ZDjd zCsyejOu3xa5TiQgY7uj1BWyuFblqyCg/I/5Om77JOmKo3FAc9t2vX7AngWDo/2OtSJU KuKQ== 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=HTiF0YIa3PdrY6tKdiAmvkQYvcKnR6W7qr1uTcPoR/g=; b=Eqgbcqd+UlTJSthOKYka4ZeBJrc0kg9TFUqxHulef66fkyD9ViCgAf/DxLADMFHx54 XywtKYfR/pbVKGeBWx2Ta2bLmFKe2HPfWGddE00i4Trvy0QB12+s9UHFMcyXSgrsQToB cjGiXV4vwt7/rB8o5WnLSfoKbm02Sq72xn4aRmYiKn1iHH/U2SeRKWYJoDvU8LdJSXd5 CeGFA6DDQ2DGhCLivgHRX1xucMBNPUGj2VS/4QzRxRzA0oLx2+n4uBVT8LFWDkMqIzjp iWl81LwaRb1Djn7uoiB2tTcNSNk04JMMS9jg1NKX+sZYytERKAP4nOYxs+y2inkqbVIm hk2w== X-Gm-Message-State: AO0yUKUal8SKdByV8oZIWP0K+d/kW13PFiMmTu8ggQnFsf11ryIltvQG dFvj5KY26UGYTK9D4+5qmIE= X-Google-Smtp-Source: AK7set8SNFnSeQFerYfakosPTO2lv9HTfk2JSlDuHOQPFj0UlaHcs92bc5omNLK3n6s6JVUFN4GaZA== X-Received: by 2002:a05:600c:3ca3:b0:3dc:5ae4:c13d with SMTP id bg35-20020a05600c3ca300b003dc5ae4c13dmr5182028wmb.4.1675793845136; Tue, 07 Feb 2023 10:17:25 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id 14-20020a05600c228e00b003dd9232f036sm16252810wmf.23.2023.02.07.10.17.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 10:17:24 -0800 (PST) Date: Tue, 7 Feb 2023 19:17:22 +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 DM_RxPathSelTable Message-ID: <8846ad13a4ee4b534d2410c9bca0c2943500c858.1675792435.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable DM_RxPathSelTable to dm_rx_path_sel_table to avoid CamelCase which is not accepted by checkpatch. Remove "extern struct drx_path_sel DM_RxPathSelTable;" in rtl_dm.h as it is dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 60 +++++++++++----------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 1 - 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 911cfecd50cb..d8455b23e555 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -144,7 +144,7 @@ const u8 dm_cck_tx_bb_gain_ch14[CCK_TX_BB_GAIN_TABLE_LE= N][8] =3D { /*------------------------Define global variable--------------------------= ---*/ struct dig_t dm_digtable; =20 -struct drx_path_sel DM_RxPathSelTable; +struct drx_path_sel dm_rx_path_sel_table; /*------------------------Define global variable--------------------------= ---*/ =20 =20 @@ -1720,7 +1720,7 @@ void rtl92e_dm_rf_pathcheck_wq(void *data) else priv->brfpath_rxenable[i] =3D false; } - if (!DM_RxPathSelTable.enable) + if (!dm_rx_path_sel_table.enable) return; =20 _rtl92e_dm_rx_path_sel_byrssi(dev); @@ -1731,18 +1731,18 @@ static void _rtl92e_dm_init_rx_path_selection(struc= t net_device *dev) u8 i; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - DM_RxPathSelTable.enable =3D 1; - DM_RxPathSelTable.ss_th_low =3D RX_PATH_SEL_SS_TH_LOW; - DM_RxPathSelTable.diff_th =3D RX_PATH_SEL_DIFF_TH; + dm_rx_path_sel_table.enable =3D 1; + dm_rx_path_sel_table.ss_th_low =3D RX_PATH_SEL_SS_TH_LOW; + dm_rx_path_sel_table.diff_th =3D RX_PATH_SEL_DIFF_TH; if (priv->customer_id =3D=3D RT_CID_819X_NETCORE) - DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; + dm_rx_path_sel_table.cck_method =3D CCK_Rx_Version_2; else - DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_1; - DM_RxPathSelTable.disabled_rf =3D 0; + dm_rx_path_sel_table.cck_method =3D CCK_Rx_Version_1; + dm_rx_path_sel_table.disabled_rf =3D 0; for (i =3D 0; i < 4; i++) { - DM_RxPathSelTable.rf_rssi[i] =3D 50; - DM_RxPathSelTable.cck_pwdb_sta[i] =3D -64; - DM_RxPathSelTable.rf_enable_rssi_th[i] =3D 100; + dm_rx_path_sel_table.rf_rssi[i] =3D 50; + dm_rx_path_sel_table.cck_pwdb_sta[i] =3D -64; + dm_rx_path_sel_table.rf_enable_rssi_th[i] =3D 100; } } =20 @@ -1769,22 +1769,22 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct ne= t_device *dev) return; =20 if (!cck_Rx_Path_initialized) { - DM_RxPathSelTable.cck_rx_path =3D (rtl92e_readb(dev, 0xa07)&0xf); + dm_rx_path_sel_table.cck_rx_path =3D (rtl92e_readb(dev, 0xa07)&0xf); cck_Rx_Path_initialized =3D 1; } =20 - DM_RxPathSelTable.disabled_rf =3D 0xf; - DM_RxPathSelTable.disabled_rf &=3D ~(rtl92e_readb(dev, 0xc04)); + dm_rx_path_sel_table.disabled_rf =3D 0xf; + dm_rx_path_sel_table.disabled_rf &=3D ~(rtl92e_readb(dev, 0xc04)); =20 if (priv->rtllib->mode =3D=3D WIRELESS_MODE_B) - DM_RxPathSelTable.cck_method =3D CCK_Rx_Version_2; + dm_rx_path_sel_table.cck_method =3D CCK_Rx_Version_2; =20 for (i =3D 0; i < RF90_PATH_MAX; i++) { - DM_RxPathSelTable.rf_rssi[i] =3D priv->stats.rx_rssi_percentage[i]; + dm_rx_path_sel_table.rf_rssi[i] =3D priv->stats.rx_rssi_percentage[i]; =20 if (priv->brfpath_rxenable[i]) { rf_num++; - cur_rf_rssi =3D DM_RxPathSelTable.rf_rssi[i]; + cur_rf_rssi =3D dm_rx_path_sel_table.rf_rssi[i]; =20 if (rf_num =3D=3D 1) { max_rssi_index =3D min_rssi_index =3D sec_rssi_index =3D i; @@ -1832,12 +1832,12 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct ne= t_device *dev) } =20 rf_num =3D 0; - if (DM_RxPathSelTable.cck_method =3D=3D CCK_Rx_Version_2) { + if (dm_rx_path_sel_table.cck_method =3D=3D CCK_Rx_Version_2) { for (i =3D 0; i < RF90_PATH_MAX; i++) { if (priv->brfpath_rxenable[i]) { rf_num++; cur_cck_pwdb =3D - DM_RxPathSelTable.cck_pwdb_sta[i]; + dm_rx_path_sel_table.cck_pwdb_sta[i]; =20 if (rf_num =3D=3D 1) { cck_rx_ver2_max_index =3D i; @@ -1894,17 +1894,17 @@ static void _rtl92e_dm_rx_path_sel_byrssi(struct ne= t_device *dev) } =20 update_cck_rx_path =3D 0; - if (DM_RxPathSelTable.cck_method =3D=3D CCK_Rx_Version_2) { + if (dm_rx_path_sel_table.cck_method =3D=3D CCK_Rx_Version_2) { cck_default_Rx =3D cck_rx_ver2_max_index; cck_optional_Rx =3D cck_rx_ver2_sec_index; if (tmp_cck_max_pwdb !=3D -64) update_cck_rx_path =3D 1; } =20 - if (tmp_min_rssi < DM_RxPathSelTable.ss_th_low && disabled_rf_cnt < 2) { + if (tmp_min_rssi < dm_rx_path_sel_table.ss_th_low && disabled_rf_cnt < 2)= { if ((tmp_max_rssi - tmp_min_rssi) >=3D - DM_RxPathSelTable.diff_th) { - DM_RxPathSelTable.rf_enable_rssi_th[min_rssi_index] =3D + dm_rx_path_sel_table.diff_th) { + dm_rx_path_sel_table.rf_enable_rssi_th[min_rssi_index] =3D tmp_max_rssi+5; rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable, 0x1<> i) & 0x1) { + if ((dm_rx_path_sel_table.disabled_rf >> i) & 0x1) { if (tmp_max_rssi >=3D - DM_RxPathSelTable.rf_enable_rssi_th[i]) { + dm_rx_path_sel_table.rf_enable_rssi_th[i]) { rtl92e_set_bb_reg(dev, rOFDM0_TRxPathEnable, 0x1 << i, 0x1); rtl92e_set_bb_reg(dev, rOFDM1_TRxPathEnable, 0x1 << i, 0x1); - DM_RxPathSelTable.rf_enable_rssi_th[i] + dm_rx_path_sel_table.rf_enable_rssi_th[i] =3D 100; disabled_rf_cnt--; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.h index 1c2eb7ac52ce..01587e2fec65 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.h @@ -155,7 +155,6 @@ struct dcmd_txcmd { =20 /*------------------------Export global variable--------------------------= --*/ extern struct dig_t dm_digtable; -extern struct drx_path_sel DM_RxPathSelTable; =20 /* Pre-calculated gain tables */ extern const u32 dm_tx_bb_gain[TX_BB_GAIN_TABLE_LEN]; --=20 2.39.1