From nobody Wed Feb 11 13:05:40 2026 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 42994C6FD1F for ; Tue, 14 Mar 2023 18:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229811AbjCNSnL (ORCPT ); Tue, 14 Mar 2023 14:43:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230205AbjCNSnF (ORCPT ); Tue, 14 Mar 2023 14:43:05 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D9775BCA3 for ; Tue, 14 Mar 2023 11:42:59 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id y4so36518566edo.2 for ; Tue, 14 Mar 2023 11:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819378; x=1681411378; 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=Oag7SRyOaaDLTQg5hnswCsWRIe6BhWUvxQa3wS0l66I=; b=kdC3swFyZDWi5RSaPn88tz9mzktNSOz5/86XDNBqyqZkhQemGxcYz45eV+PlCqfp60 IuaiymNaOrsf/kVvxHZcvS4H2l8V94LP1kVO+G4lo24GFphuab7u0wGOMOaT3gElTtLj /crjxQlN6ZPGzb+FOAX7/NDe86Q3VtndPXKrV/IF1BWK49r8DskmvA8in3nMsGy7jwMf yNgcy37P2hv/xJG0PpRDzEbvhC8xLAd9IqIW02RWcjObKvq03/3IwUu0FCz7ZpEYdpfw 5FiCbHly7uXd7UtZWYagxKOPir2gJAY/V2IaXWrOYzGn6wJRTzxC7aKfK3zWiJonzuu7 IqhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819378; x=1681411378; 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=Oag7SRyOaaDLTQg5hnswCsWRIe6BhWUvxQa3wS0l66I=; b=hfyTGGvANsps/O2pwacChg0wSnbiccFWXI2w77wePIbmscEcwRIVqDbNoELTnPWblf 0045CqnD7aoJuZekPM1hiAz7Hl+Pd93s7dByp0CYc3/sUg0+4jcr8IhLVcatcyZP2Q30 MGSTzVSMJXxY8BQtn/wtrA/7d9XCzJJHIM9GG+klp0pHJA+t8avPoA1/ArRqFGwImdgQ 5EFDsMeQyxQ/cq/xmUJNMUQZ9oLGVluRu0D8tJ8tWup8vvS3HjY43sgg/e4jvfqCtss+ 2w/HeE22ENx/EfRyre+/WurfMTwt0SBOYE04hq7ztw8m3HfraDmElnmRSf9Vr2PJ8jXo Qirw== X-Gm-Message-State: AO0yUKVI1A9oBsYS892WKu2Y0AVjKCrmzA5838CmRilB4x5k3WgJIfKc eTwT+kcSMw8Jk4mP5wPFScA= X-Google-Smtp-Source: AK7set+PtHeCz9gvdn1bo7bVwP0Av7gyhUd1M2UZViQrnkf4XRCK1ajIOKMw+xTEVOnY8gIV/+S7EA== X-Received: by 2002:a17:906:748c:b0:92d:5cc4:4aca with SMTP id e12-20020a170906748c00b0092d5cc44acamr908645ejl.1.1678819378295; Tue, 14 Mar 2023 11:42:58 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id v10-20020a170906858a00b008d173604d72sm1477988ejx.174.2023.03.14.11.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:42:57 -0700 (PDT) Date: Tue, 14 Mar 2023 19:42:56 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/12] staging: rtl8192e: Join constants AGCTAB_ArrayLength with ..LengthPciE Message-ID: <98a7553403ef95609fbcb84e4cc653628b96c56c.1678814935.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" Join constants AGCTAB_ArrayLength with AGCTAB_ArrayLengthPciE to RTL8192E_AGCTAB_ARR_LEN to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 51a20379dca0..54596982bc76 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -312,7 +312,7 @@ static void _rtl92e_phy_config_bb(struct net_device *de= v, u8 ConfigType) u16 AGCTAB_ArrayLen, PHY_REGArrayLen =3D 0; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - AGCTAB_ArrayLen =3D AGCTAB_ArrayLength; + AGCTAB_ArrayLen =3D RTL8192E_AGCTAB_ARR_LEN; Rtl819XAGCTAB_Array_Table =3D Rtl819XAGCTAB_Array; if (priv->rf_type =3D=3D RF_1T2R) { PHY_REGArrayLen =3D PHY_REG_1T2RArrayLength; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index f1d183ed7ca4..d984380bcca3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define AGCTAB_ArrayLength AGCTAB_ArrayLengthPciE #define MACPHY_ArrayLength MACPHY_ArrayLengthPciE #define RadioA_ArrayLength RadioA_ArrayLengthPciE #define RadioB_ArrayLength RadioB_ArrayLengthPciE diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index 7101061e3519..be6c4b7c0e0e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -347,7 +347,7 @@ u32 Rtl8192PciEMACPHY_Array_PG[] =3D { 0x318, 0x00000fff, 0x00000800, }; =20 -u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE] =3D { +u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN] =3D { 0xc78, 0x7d000001, 0xc78, 0x7d010001, 0xc78, 0x7d020001, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index b6d4e9696452..439847b1f52b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -21,7 +21,7 @@ extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE= ]; extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE]; #define MACPHY_Array_PGLengthPciE 30 extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE]; -#define AGCTAB_ArrayLengthPciE 384 -extern u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE]; +#define RTL8192E_AGCTAB_ARR_LEN 384 +extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN]; =20 #endif --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 E2241C05027 for ; Tue, 14 Mar 2023 18:43:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230105AbjCNSn2 (ORCPT ); Tue, 14 Mar 2023 14:43:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229988AbjCNSnV (ORCPT ); Tue, 14 Mar 2023 14:43:21 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6827BE1AF for ; Tue, 14 Mar 2023 11:43:07 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id ek18so34811657edb.6 for ; Tue, 14 Mar 2023 11:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819386; x=1681411386; 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=TA9zaJ5cm57+RQC5jLFl72abHNghx3LQzCmXrcIYNDI=; b=LggMcBwAP4URtNCS2KXeD+vsh8cUFnRZcAeMOaPoaQMUEJeFMnc6gpVgVt9fUplcsn dS1wXcboTSxV6Oxiaus9hD61AFByPwEEaS9ZxwlFlnMS8OpuAUv2lCbQOkB8XJSZc45b D1cPF5UF2OldJbwB0uIsotEblsniokvsdxJ4B2OIj7GfmWpcS4msRAG+eOvIlYOPB7KS mDw2KoUPd/UIJUlz1ZksJm7T0v1E9vp8wbjr/Xq+hVtXIP6st5lxjTfM2aglaR5E7J6m Y+q3Sk2RuOvXgrEGJgsWQMe5du52LNQW3kRyJclHsGvy+eYmynwkAeAlEo/DYaeogg7S mX0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819386; x=1681411386; 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=TA9zaJ5cm57+RQC5jLFl72abHNghx3LQzCmXrcIYNDI=; b=NZuu3G4/nX6ejevqb9O60qufVbx9v/Ez+u8rmb2DFswuWzijQe22OS1+une4JSutm9 K28EqmEx4+N8q7L05ykdrRF4qfM+HWMQ60Ciw5w271YmvN2kykkvrL1Bw5pdeWNV5Rzc QG+FpIhNjOW8mgRuAazTbZMT8d/804pjNLmAB9XCjXLEoygU1SAfGJ/QNRp5dBjdcR7u JrEepru7+wWlZXgGjv8TeuNoYgo9XhdjsLx/drqogfe4puyHgdiMj9iUs6y4QJ0SW/AL jA4Q6ijZB855Zh7FxcftVL6opqM3w/4gN3s9r0JlQHPpM2wljsPeiToM/EABDZnhQ6zR GLKg== X-Gm-Message-State: AO0yUKU+1ysUChDAuLJH+tZIZwZSOru6TDoh+Xbt2u8KfZP5sal7xwWL ior0T19qCU2DiPL/Ru+UvkFSeuBsFlE= X-Google-Smtp-Source: AK7set90F8apQmTQepJarCZvWAZB0Il3suuwXupQV/v2GNqcTmWfdE05HneKUQON1vmy/qZKtTjP7g== X-Received: by 2002:a17:906:109b:b0:92c:f016:7ac2 with SMTP id u27-20020a170906109b00b0092cf0167ac2mr955084eju.0.1678819385820; Tue, 14 Mar 2023 11:43:05 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id hb25-20020a170906b89900b009294524ac21sm1495274ejb.60.2023.03.14.11.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:05 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:03 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/12] staging: rtl8192e: Join constants MACPHY_ArrayLength with ..LengthPciE Message-ID: <881ce5739e4237ea9a31029acaa535422d41fa5f.1678814935.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" Join constants MACPHY_ArrayLength with MACPHY_ArrayLengthPciE to RTL8192E_MACPHY_ARR_LEN to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 54596982bc76..29918a529f77 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -291,7 +291,7 @@ void rtl92e_config_mac(struct net_device *dev) pdwArray =3D Rtl819XMACPHY_Array_PG; =20 } else { - dwArrayLen =3D MACPHY_ArrayLength; + dwArrayLen =3D RTL8192E_MACPHY_ARR_LEN; pdwArray =3D Rtl819XMACPHY_Array; } for (i =3D 0; i < dwArrayLen; i +=3D 3) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index d984380bcca3..611756517ce6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define MACPHY_ArrayLength MACPHY_ArrayLengthPciE #define RadioA_ArrayLength RadioA_ArrayLengthPciE #define RadioB_ArrayLength RadioB_ArrayLengthPciE #define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index 439847b1f52b..cb424c8fbee0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -17,8 +17,8 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArray= LengthPciE]; extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE]; #define RadioB_ArrayLengthPciE 78 extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; -#define MACPHY_ArrayLengthPciE 18 -extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE]; +#define RTL8192E_MACPHY_ARR_LEN 18 +extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN]; #define MACPHY_Array_PGLengthPciE 30 extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE]; #define RTL8192E_AGCTAB_ARR_LEN 384 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 3AFCBC05027 for ; Tue, 14 Mar 2023 18:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230173AbjCNSnh (ORCPT ); Tue, 14 Mar 2023 14:43:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbjCNSnf (ORCPT ); Tue, 14 Mar 2023 14:43:35 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23FFEAFBA2 for ; Tue, 14 Mar 2023 11:43:14 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id y4so36521280edo.2 for ; Tue, 14 Mar 2023 11:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819393; x=1681411393; 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=g8LjbSZR0Kfj/oBrMiuwr7Jdgg7szPbhvPzSbkmPBCg=; b=UyM49eccXFnyBClUPyJYe3LGlGKmaxEGqwTrTg4KCv9YBDdEY6+K1zqB5J5ndkLM1O c+DypDpYQF+6v4bILw7mdHYgNTks84qpDz4OzOzeReTZ1/fzPtljJuMRMimcx+AvjUck R6Ce+b7w5Ow8giGiwTHyBAj3Vo95xRS+9zPO6cFhPLJnEM6vzHRSixz12kN8otwuBoGM oNOLfY3eyl/6bCuzAf5JzKZ7iV3JLYpODMQ2YlD38A/KV9tqmIfSR3Duz+m2j50fs/oF NAL2D75QMAM0gXh7zPdeyKh2zqA23KGm1fGFHfx03zjcIWoTwnzWC+4QFj5vG0R2Sj6q ajxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819393; x=1681411393; 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=g8LjbSZR0Kfj/oBrMiuwr7Jdgg7szPbhvPzSbkmPBCg=; b=GnXVnkxOY0hoG6kzcs8muhkKEf3YixE/b0z+G7xEZHzbzXHas2TWeLuGXvyjNYdVoJ zYubv0bmigv4LFuol4KMoBcsTGPayW5za97hq4Hp1AfKahZaaFdpcVQAKQK9q7Jtlt8F fGhkEmU0IPkdbNT15exMDK3J9MenNk0VGjjn9Es5ETtcXi0WpQRV++UhaFRsEfWLcx9v q/A5sTSml+PfAXtE1nt5+gtInpoQG4dxpXFLSdQQdms+IY7psGpMblFSn+blkB4lCKe+ LhxXZv6U549kIIYC241kYsdMMry5blKzigXOOYvwAukM+8y+KF4pVOoWNQQfw+bZc6Du b5QA== X-Gm-Message-State: AO0yUKV0zAJxXqTrDG8XE/XQXBdOzyyIf9I/LXK5D2WpNe3PfKX9dbhR OrTQ65OwW+4iQV5zGwQu7F44OQrPMBE= X-Google-Smtp-Source: AK7set/ON/jpn8wtxOhWEVadk2vyaDcFBz4jPlhB1SAt4+VYDDD8bC5u24X8NA5GRjf7vxgMYQSeBA== X-Received: by 2002:a17:906:208a:b0:889:d24e:6017 with SMTP id 10-20020a170906208a00b00889d24e6017mr15455601ejq.3.1678819393708; Tue, 14 Mar 2023 11:43:13 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id y11-20020a17090629cb00b008e17dc10decsm1491695eje.52.2023.03.14.11.43.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:13 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:11 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/12] staging: rtl8192e: Join constants RadioA_ArrayLength with ..LengthPciE 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" Join constants RadioA_ArrayLength with RadioA_ArrayLengthPciE to RTL8192E_RADIO_A_ARR_LEN to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 29918a529f77..e4d1b7ad64ac 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -542,7 +542,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum r= f90_radio_path eRFPath) =20 switch (eRFPath) { case RF90_PATH_A: - for (i =3D 0; i < RadioA_ArrayLength; i +=3D 2) { + for (i =3D 0; i < RTL8192E_RADIO_A_ARR_LEN; i +=3D 2) { if (Rtl819XRadioA_Array[i] =3D=3D 0xfe) { msleep(100); continue; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 611756517ce6..8f9200bed456 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define RadioA_ArrayLength RadioA_ArrayLengthPciE #define RadioB_ArrayLength RadioB_ArrayLengthPciE #define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE #define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index be6c4b7c0e0e..5820c47f4e14 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -157,7 +157,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengt= hPciE] =3D { 0xe1c, 0x12121416, }; =20 -u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] =3D { +u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] =3D { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x00000ee0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index cb424c8fbee0..d177b7b17b19 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -13,8 +13,8 @@ =20 #define PHY_REG_1T2RArrayLengthPciE 296 extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; -#define RadioA_ArrayLengthPciE 246 -extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE]; +#define RTL8192E_RADIO_A_ARR_LEN 246 +extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN]; #define RadioB_ArrayLengthPciE 78 extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; #define RTL8192E_MACPHY_ARR_LEN 18 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 9913AC7618B for ; Tue, 14 Mar 2023 18:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230253AbjCNSns (ORCPT ); Tue, 14 Mar 2023 14:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230229AbjCNSnn (ORCPT ); Tue, 14 Mar 2023 14:43:43 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B589B5B6A for ; Tue, 14 Mar 2023 11:43:22 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id eh3so10066135edb.11 for ; Tue, 14 Mar 2023 11:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819401; 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=bBloYsUXJ4nsR8iknh3IyaxMJy5tm/ZnRPS+e2A2ehg=; b=Cc+eiJJbpaK++5Rpay8c+vgf1LlAgiCX3DI4PS/aI4YE9gO9ZLvjBJdjjJF+6BJBay y7DHAPVpDsbfVF7IBWbaPIfLIiqPLnZij93vd7in/ZCRDqTBV2cP+uCVx3ozwKiWmGGz nQGigmOZrgg/Qprns29T/XF2w2nY4UabatJ36iE9S6qy/T/+SMaTL7sgkGt94w8NqAjh uGoTdde8s4SNhw5PdK9mg1syzSZ/vUTdTGb1xMsZA2ETSbc86JfvRmqyYX4+KgkAUl5d lWm9GewyPRP+4KHEPdMMTvScR02t3BmGqd9QRYhIsY0OfkHhbnxcxz8b0mPnck9zL3Jo R2MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819401; 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=bBloYsUXJ4nsR8iknh3IyaxMJy5tm/ZnRPS+e2A2ehg=; b=YQlB5E6Ym8QMf3IOBo2V3LOBvNMDUaDld3vf39VbGKPL1RV2sakltpHpsPbn8ooVr6 766QVcmH5+6+Dh/EGKGdmwNNjnLgd1h8B0sutwg+HUWF5wgdiY3oXix1fBhB7va6MBsS hkMywSpkjZKbIJ1fXAtIJdUlP1OXtovj6nfYhmcIvA9tobWbUkvb+5/WHBSs3IxVLXGI DoyGmuM32WpgGAVqCKj87BRX4TYTxFxZzpPY5ri+NQRgWnSuoNMwziFh1XE+OEX7Y8g9 D7t+PYPnfO9UAA0uYJrHTbJ3q5MyVpwT/KmbpuxOWY6HeIhA1XK1Ep3E76Xg0pu6zoGs Uysg== X-Gm-Message-State: AO0yUKXDPKiwHjYnQS8kbiED2ARUhKHLSTMKHxBH2ULQu/Ve0ThrqL+W kPfRJe80esp1oURMwU9cUe4jT1uapXE= X-Google-Smtp-Source: AK7set82crYoVByFkf/r3suirXAZgQUEAOMpVghg/agMHrlHAptZNl24Mv+kHQaXhJNVPNF8oAJr1g== X-Received: by 2002:a05:6402:3490:b0:4fb:886:c9d9 with SMTP id v16-20020a056402349000b004fb0886c9d9mr13419798edc.1.1678819400803; Tue, 14 Mar 2023 11:43:20 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id r23-20020a50aad7000000b004f9e6495f94sm1435311edc.50.2023.03.14.11.43.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:20 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:18 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/12] staging: rtl8192e: Join constants RadioB_ArrayLength with ..LengthPciE Message-ID: <1f48c0691eb4627be81fc39d08762617a6c58a08.1678814935.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" Join constants RadioB_ArrayLength with RadioB_ArrayLengthPciE to RTL8192E_RADIO_B_ARR_LEN to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index e4d1b7ad64ac..e42b77f91528 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -554,7 +554,7 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum r= f90_radio_path eRFPath) } break; case RF90_PATH_B: - for (i =3D 0; i < RadioB_ArrayLength; i +=3D 2) { + for (i =3D 0; i < RTL8192E_RADIO_B_ARR_LEN; i +=3D 2) { if (Rtl819XRadioB_Array[i] =3D=3D 0xfe) { msleep(100); continue; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 8f9200bed456..e9ff224953f9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define RadioB_ArrayLength RadioB_ArrayLengthPciE #define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE #define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index 5820c47f4e14..5c9844f4d117 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -283,7 +283,7 @@ u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] = =3D { 0x007, 0x00000700, }; =20 -u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] =3D { +u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] =3D { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x000006e0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index d177b7b17b19..174a4dfb1855 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -15,8 +15,8 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; #define RTL8192E_RADIO_A_ARR_LEN 246 extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN]; -#define RadioB_ArrayLengthPciE 78 -extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; +#define RTL8192E_RADIO_B_ARR_LEN 78 +extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN]; #define RTL8192E_MACPHY_ARR_LEN 18 extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN]; #define MACPHY_Array_PGLengthPciE 30 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 DBB2FC05027 for ; Tue, 14 Mar 2023 18:44:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230340AbjCNSoA (ORCPT ); Tue, 14 Mar 2023 14:44:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230309AbjCNSnv (ORCPT ); Tue, 14 Mar 2023 14:43:51 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30FB1B6D05 for ; Tue, 14 Mar 2023 11:43:27 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id o12so65956785edb.9 for ; Tue, 14 Mar 2023 11:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819406; x=1681411406; 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=1s6Yk/yWtlCX9fg4ML/GfDhv7pAqeBZ0tu9hAhPDEqY=; b=fxAhfQl45raltob89lwevzlkzxHc89XaRkIphYOQFCnW/fkSqzg+EJH+8r2f1xLm+B aB+umYoqB796rSd+OCFc6L0IswAK+oCzrig1Ite3NT9CF2af9Me3LIMsRSig7lsjK+St n/n6/1OiBGo9g/T6RAwMNypNlFs4FILhRGcz/Nsc7tEEOBR/D3Uj8iislEhyN8gHJpqx EahkBi9XYGpg7ASvV8pPCseGtSdsseeMMMyEk6BFVnB4rS9YuSzyNvXZ0pGv2WyW1d8S pF1WaDFN/fI7fdSsU5NrOhRFXkwanVCIKv5w76vwlaxcKYG+FuaE2Y0DDGD0fNy5uWB5 Bfjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819406; x=1681411406; 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=1s6Yk/yWtlCX9fg4ML/GfDhv7pAqeBZ0tu9hAhPDEqY=; b=EqOLJSwHRdj/qs/cpWw14YhYvn3OpcK3+h4uDB5z9xzhh0VqgzUtmbzlLKS+9CEDMT sEZ4VXeBVP+dZ8v9SHev8ditRZBKllwIvYANmg4ID7k+tMQBwfVwRtROUkfCRy1CdCU0 wKVhLEFSchiAnu5/GUBmlJTDuJLow62GY2jrhv6TVw6rtKhZP8wiz+QZf32yW1f+VNnt xyw35indxsOHqyu1RGcfOqtoo1N0uY9o8Pb3mKdKgoCdlwPk8/EnT0sUpYsDtb86a4/+ x7lqJRudUnFEEj2e4/pzBF3WnoUNkQH7iSjgDG6QSlzM/yIwGowFi9ZRaaKMqfLah/0b yl2Q== X-Gm-Message-State: AO0yUKV6nLLfmdOA0R792WgnwW5w/01HxQtialDH4e4PbeQpP/UGNous eSU8GiGrdjo7nqd5s27n+Bc= X-Google-Smtp-Source: AK7set9zNMSHSq9eFpUG0x2uaPc2fZJ+86vcuIt/Y2t9FqHX52cMclEswWh2d2W/wCo9f0RMemQO/A== X-Received: by 2002:a17:906:5c:b0:88c:f97c:7c87 with SMTP id 28-20020a170906005c00b0088cf97c7c87mr14743490ejg.2.1678819406565; Tue, 14 Mar 2023 11:43:26 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id br7-20020a170906d14700b008c979c74732sm1446505ejb.156.2023.03.14.11.43.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:26 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:24 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/12] staging: rtl8192e: Join constants MACPHY_Array_PGLength with ..LengthPciE Message-ID: <6d86257ddf3fecbf2bb104f1eeedbf09a56e0861.1678814935.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" Join constants MACPHY_Array_PGLength with MACPHY_Array_PGLengthPciE to RTL8192E_MACPHY_ARR_PG_LEN to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index e42b77f91528..86d51eb7af17 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -287,7 +287,7 @@ void rtl92e_config_mac(struct net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); =20 if (priv->tx_pwr_data_read_from_eeprom) { - dwArrayLen =3D MACPHY_Array_PGLength; + dwArrayLen =3D RTL8192E_MACPHY_ARR_PG_LEN; pdwArray =3D Rtl819XMACPHY_Array_PG; =20 } else { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index e9ff224953f9..73a532b96777 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE #define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE =20 #define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index 174a4dfb1855..70c31d56ea14 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -19,8 +19,8 @@ extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_L= EN]; extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN]; #define RTL8192E_MACPHY_ARR_LEN 18 extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN]; -#define MACPHY_Array_PGLengthPciE 30 -extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE]; +#define RTL8192E_MACPHY_ARR_PG_LEN 30 +extern u32 Rtl8192PciEMACPHY_Array_PG[RTL8192E_MACPHY_ARR_PG_LEN]; #define RTL8192E_AGCTAB_ARR_LEN 384 extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN]; =20 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 56081C6FD1F for ; Tue, 14 Mar 2023 18:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229552AbjCNSoL (ORCPT ); Tue, 14 Mar 2023 14:44:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbjCNSoA (ORCPT ); Tue, 14 Mar 2023 14:44:00 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 681C2126C5 for ; Tue, 14 Mar 2023 11:43:36 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id o12so65958151edb.9 for ; Tue, 14 Mar 2023 11:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819414; 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=d0AW1dgnhE5Xlf5n9QYJOtZN1NTrjTisP+WLFv3uPMk=; b=C2j9764WpXjc8CwbYV5XLIBEsdRgH4vazbHwIq2xko9wc0vf/8yX50is53SRJRQdtQ 6sPlwfFtaM8L029J8yxGJRFDSSCcBosVjLzAll3E0lKmUzE4RDOsWd7V9TpK1WYjw13T y5iekO71QP7vTl6n9zKWUNjDALVnMnMs/AmZKbpnF5Tf0uLL0UGBhIllBBPkPdMegVRy 0uDM0uwjH10GPPWng1WuY/9h0dJw2+riP8gsdJBwP19t9mA8YrIGCoStWwIbeJLlYY9B vabc05uPIXNf7qFR8Rr6QxRqvMmd4z9uLTOlLTgSvdYsBWdk4EpsP2te7AmOdIRt27zy hjEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819414; 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=d0AW1dgnhE5Xlf5n9QYJOtZN1NTrjTisP+WLFv3uPMk=; b=y7h24izxILCVhm8QABBY+boRexVk9tsa9uihtj8jw/H1eG3rTVrEYhaagZ4yCqbv8C SOJGHoWKKRcaLGYcq14ZlhU7fV98nHl/4d1XGeeGHMXHyeDWuZUpyWgnWh7MHbxbPky7 NQpl56DEu7g3Rs7h7mDclfadtRF8WFht9hleLtOhm+n4Nymnwhq3hWkb3BYXoEW2cFqh JI+RHIdcGyoZ5cZzdTu4aOBrAJ2ytRZr0HQW+r8uIvkG4J6gPkRdtmtss0TsCEKL4G39 JHKS7j5suEDPPX46EMXIZvo2zd+18WOWevzNk8UiOUSa3BMtjea7S6dDz/4UhooJlxtX PHAA== X-Gm-Message-State: AO0yUKU0QM9OQR4HKMI+dL+Fi+aeT6VIuHEUPaYo6S3ndPvPi8LkzXUJ Mnh61JiTaJMyy7DJ8Owri48= X-Google-Smtp-Source: AK7set+1qlK8tRCzTt4IZ8AZFpcBKyXC8eo0cEI0CEFjvJ3m84Du/17pMV1Rkr/wQd3L5LGKiFuUaQ== X-Received: by 2002:a17:906:1097:b0:8b1:4141:8a30 with SMTP id u23-20020a170906109700b008b141418a30mr17008911eju.6.1678819414379; Tue, 14 Mar 2023 11:43:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id g12-20020a1709064e4c00b008df7d2e122dsm1479082ejw.45.2023.03.14.11.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:34 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/12] staging: rtl8192e: Join constants PHY_REG_1T2RArray.. with ..LengthPciE Message-ID: <0e24d00350bd2c6d17558ea6b6667209e15073d2.1678814935.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" Join constants PHY_REG_1T2RArrayLength with PHY_REG_1T2RArrayLengthPciE to RTL8192E_PHY_REG_1T2R_ARR_LEN to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 86d51eb7af17..231bd49b8892 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -315,7 +315,7 @@ static void _rtl92e_phy_config_bb(struct net_device *de= v, u8 ConfigType) AGCTAB_ArrayLen =3D RTL8192E_AGCTAB_ARR_LEN; Rtl819XAGCTAB_Array_Table =3D Rtl819XAGCTAB_Array; if (priv->rf_type =3D=3D RF_1T2R) { - PHY_REGArrayLen =3D PHY_REG_1T2RArrayLength; + PHY_REGArrayLen =3D RTL8192E_PHY_REG_1T2R_ARR_LEN; Rtl819XPHY_REGArray_Table =3D Rtl819XPHY_REG_1T2RArray; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 73a532b96777..96c581475ffe 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,8 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE - #define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG #define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array #define Rtl819XRadioA_Array Rtl8192PciERadioA_Array diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index 5c9844f4d117..b2cf4d147c63 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -6,7 +6,7 @@ */ #include "table.h" =20 -u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] =3D { +u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN] =3D { 0x800, 0x00000000, 0x804, 0x00000001, 0x808, 0x0000fc00, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index 70c31d56ea14..d00aa394c36a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -11,8 +11,8 @@ =20 #include =20 -#define PHY_REG_1T2RArrayLengthPciE 296 -extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; +#define RTL8192E_PHY_REG_1T2R_ARR_LEN 296 +extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN]; #define RTL8192E_RADIO_A_ARR_LEN 246 extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN]; #define RTL8192E_RADIO_B_ARR_LEN 78 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 ACBBDC6FD1F for ; Tue, 14 Mar 2023 18:44:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230033AbjCNSoV (ORCPT ); Tue, 14 Mar 2023 14:44:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230355AbjCNSoN (ORCPT ); Tue, 14 Mar 2023 14:44:13 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7865B6426C for ; Tue, 14 Mar 2023 11:43:47 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id cy23so65854990edb.12 for ; Tue, 14 Mar 2023 11:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819425; x=1681411425; 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=ze6PWDtpTyasNsC7Si9pFrohRL/yry2tJYYV5FMAIsk=; b=AxozyntRZTjPmQW0qX60okLObdCPhR78Cbee2F68YOzLSq6PiLjOn6AjnE9RNK+LMV p+B+QejozmdjgqJ4h173WdLqv26MbWgd7xL4OW+cZh+XGOngmQS/61CwBTvmODASzIMx n1xZI8W96gSeFSicgPF/YWwLcqKiRsEwBJZtV5AxJof7SpeqmxRzpOqKNyQwBetBDwHv K8QvKUDXFKJlCxPhcITslgWwTC6ObZyOmaH1bqnRYId+NT1VVvizqKs3FjOH395hd0kZ ce/uPxUBP2iMoE37vC9GN6cTkW96jQIgWiSKvaK+SG2pWTlp3dfJ+POoUWUhH63wIQoN OSsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819425; x=1681411425; 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=ze6PWDtpTyasNsC7Si9pFrohRL/yry2tJYYV5FMAIsk=; b=UVkG8s9NiIYvS0E9Q4r9xYHVMUzO/BwdmcEEAm336leqIGpvMCxoDmnNJWDJygQI7E XPAFXKNqQH2WLdjXTTQNVAEsWTZqACq8CHgX0obGfOpCOFECbsQkJea8updEwWSEOm0c RFfCx3KUJBYJQSjSJZ59K6H9tojm1pIJCWzg9OF3d+y5P6PFUr0ySNSbKP1dweqbdgP4 zGPBnpXqPF0Hn+XtvRr94a5VJ+5OPhBhGwBwzmWtWVAD79d/AQ11icoU6fdLz+H0mCFJ lpZnCSFJv3j4XcNa+f/YTOv3tZuOzLs8Swfc4ir8J4Z5kEalPtsoo8OFf4Q3afE5jr3M XSDA== X-Gm-Message-State: AO0yUKVyfgPZOoapgnGp34w+pw9EmoPdFJFA/J/Vqdc/FfdeFah0C6Km OkPMIKN5AP+OdpkKG5m6GzQ= X-Google-Smtp-Source: AK7set96Tg+oaZgxZ3DonRo1JULWHayrtLNdW+cZjGYUvK/wR88d6TWPVNRtWkds7hIpFTC1/83ehQ== X-Received: by 2002:a17:906:738f:b0:8aa:c0d5:25b1 with SMTP id f15-20020a170906738f00b008aac0d525b1mr862960ejl.5.1678819425543; Tue, 14 Mar 2023 11:43:45 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id go37-20020a1709070da500b00927b85e48b0sm1449001ejc.111.2023.03.14.11.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:45 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:43 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/12] staging: rtl8192e: Join constants Rtl819XMACPHY_..PG with Rtl8192PciE.. 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" Join constants Rtl819XMACPHY_Array_PG with Rtl8192PciEMACPHY_Array_PG to RTL8192E_MACPHY_ARR_PG to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 231bd49b8892..ef33f651f018 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -288,7 +288,7 @@ void rtl92e_config_mac(struct net_device *dev) =20 if (priv->tx_pwr_data_read_from_eeprom) { dwArrayLen =3D RTL8192E_MACPHY_ARR_PG_LEN; - pdwArray =3D Rtl819XMACPHY_Array_PG; + pdwArray =3D RTL8192E_MACPHY_ARR_PG; =20 } else { dwArrayLen =3D RTL8192E_MACPHY_ARR_LEN; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 96c581475ffe..694528ca7910 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG #define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array #define Rtl819XRadioA_Array Rtl8192PciERadioA_Array #define Rtl819XRadioB_Array Rtl8192PciERadioB_Array diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index b2cf4d147c63..aed1c46dedf6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -334,7 +334,7 @@ u32 Rtl8192PciEMACPHY_Array[] =3D { 0x318, 0x00000fff, 0x00000100, }; =20 -u32 Rtl8192PciEMACPHY_Array_PG[] =3D { +u32 RTL8192E_MACPHY_ARR_PG[] =3D { 0x03c, 0xffff0000, 0x00000f0f, 0xe00, 0xffffffff, 0x06090909, 0xe04, 0xffffffff, 0x00030306, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index d00aa394c36a..f94975b112aa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -20,7 +20,7 @@ extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_L= EN]; #define RTL8192E_MACPHY_ARR_LEN 18 extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN]; #define RTL8192E_MACPHY_ARR_PG_LEN 30 -extern u32 Rtl8192PciEMACPHY_Array_PG[RTL8192E_MACPHY_ARR_PG_LEN]; +extern u32 RTL8192E_MACPHY_ARR_PG[RTL8192E_MACPHY_ARR_PG_LEN]; #define RTL8192E_AGCTAB_ARR_LEN 384 extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN]; =20 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 D3E8BC05027 for ; Tue, 14 Mar 2023 18:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230043AbjCNSoe (ORCPT ); Tue, 14 Mar 2023 14:44:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230415AbjCNSoZ (ORCPT ); Tue, 14 Mar 2023 14:44:25 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5846222E6 for ; Tue, 14 Mar 2023 11:43:57 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id ek18so34820323edb.6 for ; Tue, 14 Mar 2023 11:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819435; x=1681411435; 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=0y9mPuC4HKBUj5I294EC9CBSZXqeTk6Vm6POjoEahtQ=; b=Q8dEcaCUfpEN+VAxpheSP82vMpI+AiH74bQ+iGkrb0Ti5xK3kP5WC6INk8zgkWQ/Pd 80JylRbs7bpUhv+zYQKgIUS2FzMf8QB7zQE3X1s6S+Uyp1hlDtLY+V3BwAJIEZbswxuX QFTqOB9cfuldBl2ixS8Ktrtj7ApDFogMyRisfqtFQJwplD815mC3pLbV46LBujZBV85e J6RGoYoLsdA0nJ5zcTnGPY9+7QHRj/RDfNgHp780fBkRgTsOG0G7oH7bfr08QXyAgPrb L6Y6NWvdKTkhrePSURvCEInmVzuxNn1FyEzmtEJW3D0GovoDkqFWJmiSBXoIIm0m8EGh 74gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819435; x=1681411435; 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=0y9mPuC4HKBUj5I294EC9CBSZXqeTk6Vm6POjoEahtQ=; b=ukBuoLu/TceO7EqAUSdZN9K14myqCW4dMcUvUOA0tY9/4PaDpw98xxwRtzsI4QXq9V 8+LNiDhkd3xQ5Ncq7wZ7C4Pi0hE5vwXjBJMg4K+wmA40XerdOc3OTZwOWKGo2B0x4nbt 0A0aa7EC6oEMuAdezE7wHh1xDu0WR0L5lGlcn039HagsNiDtFRrrGAtfviBuWJrYCphs r1NbOY673ETjStV7/KkWMR9nu4FT3RgEVgib9ZA8qC0j4NVQeAHwMaRonjaqnmwT2WbB ysoybsFLZua+x3He09AYT8EevQMy0HcDslMNd/TROSPbSL8voc/lyLTKdE4rXVSO9gHf Kkqw== X-Gm-Message-State: AO0yUKX6UmCZUm8i3Fh7LFVNJOi/7QB44Y6Vmzzll6ZQsWIEx2WiCRts KSQd6BuvBRGlSynIcNlMY4M= X-Google-Smtp-Source: AK7set/O4bLq9OSTWrY/lvH2idxmzOwX8jrmOGxinb+SgyOjYjcLhvrekFpetbnM/dUYwanclV0KHg== X-Received: by 2002:a05:6402:42d5:b0:4fd:c0a4:224c with SMTP id i21-20020a05640242d500b004fdc0a4224cmr3881221edc.4.1678819434983; Tue, 14 Mar 2023 11:43:54 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id b72-20020a509f4e000000b0049e1f167956sm1440486edf.9.2023.03.14.11.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:43:54 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:52 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] staging: rtl8192e: Join constants Rtl819XMACPHY_.. with Rtl8192PciE.. Message-ID: <6e5609e6b31892671d203c9da1a947bd42b70c37.1678814935.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" Join constants Rtl819XMACPHY_Array with Rtl8192PciEMACPHY_Array to RTL8192E_MACPHY_ARR to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index ef33f651f018..bf4fec83d316 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -292,7 +292,7 @@ void rtl92e_config_mac(struct net_device *dev) =20 } else { dwArrayLen =3D RTL8192E_MACPHY_ARR_LEN; - pdwArray =3D Rtl819XMACPHY_Array; + pdwArray =3D RTL8192E_MACPHY_ARR; } for (i =3D 0; i < dwArrayLen; i +=3D 3) { if (pdwArray[i] =3D=3D 0x318) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 694528ca7910..2d2b80bc1f21 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array #define Rtl819XRadioA_Array Rtl8192PciERadioA_Array #define Rtl819XRadioB_Array Rtl8192PciERadioB_Array #define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index aed1c46dedf6..0ab786d35682 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -325,7 +325,7 @@ u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] = =3D { 0x007, 0x00000700, }; =20 -u32 Rtl8192PciEMACPHY_Array[] =3D { +u32 RTL8192E_MACPHY_ARR[] =3D { 0x03c, 0xffff0000, 0x00000f0f, 0x340, 0xffffffff, 0x161a1a1a, 0x344, 0xffffffff, 0x12121416, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index f94975b112aa..c6c7d4cd313e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -18,7 +18,7 @@ extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_L= EN]; #define RTL8192E_RADIO_B_ARR_LEN 78 extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN]; #define RTL8192E_MACPHY_ARR_LEN 18 -extern u32 Rtl8192PciEMACPHY_Array[RTL8192E_MACPHY_ARR_LEN]; +extern u32 RTL8192E_MACPHY_ARR[RTL8192E_MACPHY_ARR_LEN]; #define RTL8192E_MACPHY_ARR_PG_LEN 30 extern u32 RTL8192E_MACPHY_ARR_PG[RTL8192E_MACPHY_ARR_PG_LEN]; #define RTL8192E_AGCTAB_ARR_LEN 384 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 B6F04C05027 for ; Tue, 14 Mar 2023 18:44:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230429AbjCNSoi (ORCPT ); Tue, 14 Mar 2023 14:44:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230372AbjCNSob (ORCPT ); Tue, 14 Mar 2023 14:44:31 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C4955617E for ; Tue, 14 Mar 2023 11:44:04 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id h8so22196399ede.8 for ; Tue, 14 Mar 2023 11:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819441; 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=JhOP8mQ5Z2Gmq+/y1PXXgLvgLODRnQ4GFaonYd0lOUw=; b=P50FfZweqLtcGAFr2+JlKgYeryjXgIlvdsMCvh5JHJoPL0gmt/q99CFhc7rbMf5qGz 4OKMzRnfJRGF23e0mWtSuKYq9H2nW1VpqAFkiz6z73oBKGliCngPb23O7Na46Xo1jzA3 7O4RiCzA53HUDeWeEkd5EhIG8twELC+dJHFgi18fQYuF82IJw9GBgIdZkgOMLY18ZoAk BzJSzkyyaZGoCJb/92S/C8iHrOhrMeevtIYEvBbmkO5T3rQZ/Vmh/TunCaUcmMxrzf8W /LxJvR+abewzFVk7Nc7Al0l2qGyPN7aPxMTkm875GNqemo35z4gExnAVB803Q/vEXT8P msvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819441; 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=JhOP8mQ5Z2Gmq+/y1PXXgLvgLODRnQ4GFaonYd0lOUw=; b=5TOGwaZBalngw6H/l094XWjlFlLHblGfr7GOv+u/5srWJA7Mua4XSGUhm1GwLX4htX O90aWO9Vw1wYU1UQF1+b/OkpeNeKGruegYU0+EJh9MMaFJ3O/nnnFetvfgoilHSlmPwU qjzAlu0Je+O/G1fXn1fWEGwnuXguhYdT0yP5GQurRIebPigzRLlxVWHEA9yyqpta84qn 6pdnqr36jz43PL2YBFR/FdcZSVIlD1h5+LQB9grnK0jrSZX03wfnimwVn+znzed25YQi lHA2pxYN0d1LsRzqT1/1Ecku9SliD2mCd8mxuoZmprQdXymTv1aYjwvOk+FOnOC5RWtV fNLA== X-Gm-Message-State: AO0yUKVcjVx0YawwvSN1+hBR/95m1MMkyaS2o+ee2uZtWsVJYlqHrLcx sjAQaiWGRYPbSsjGMN18xKA= X-Google-Smtp-Source: AK7set+PIEkUWxnQhJUd8f+NTLDRwkt0ZG5GMGUpPCOPKVWm4UA0JFomM0lf53w2mVprSlZBPioedw== X-Received: by 2002:a05:6402:1d54:b0:4fb:ac81:49bf with SMTP id dz20-20020a0564021d5400b004fbac8149bfmr11012979edb.4.1678819441658; Tue, 14 Mar 2023 11:44:01 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id e20-20020a50d4d4000000b004fbf6b35a56sm1404258edj.76.2023.03.14.11.44.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:44:01 -0700 (PDT) Date: Tue, 14 Mar 2023 19:43:59 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/12] staging: rtl8192e: Join constants Rtl819XRadioA_.. with ..RadioA_.. Message-ID: <0ce85e55fd9ddd5459590d756a951809b6a1b9ee.1678814935.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" Join constants Rtl819XRadioA_Array with Rtl8192PciERadioA_Array to RTL8192E_RADIO_A_ARR to improve readability. Fix spaces around '+' to improve coding style. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index bf4fec83d316..49fdaacb788a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -543,13 +543,13 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum= rf90_radio_path eRFPath) switch (eRFPath) { case RF90_PATH_A: for (i =3D 0; i < RTL8192E_RADIO_A_ARR_LEN; i +=3D 2) { - if (Rtl819XRadioA_Array[i] =3D=3D 0xfe) { + if (RTL8192E_RADIO_A_ARR[i] =3D=3D 0xfe) { msleep(100); continue; } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioA_Array[i], + rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_A_ARR[i], bMask12Bits, - Rtl819XRadioA_Array[i+1]); + RTL8192E_RADIO_A_ARR[i + 1]); =20 } break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 2d2b80bc1f21..74c7850e514c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array #define Rtl819XRadioB_Array Rtl8192PciERadioB_Array #define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array #define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index 0ab786d35682..4f36a480f6f2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -157,7 +157,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_= ARR_LEN] =3D { 0xe1c, 0x12121416, }; =20 -u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] =3D { +u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN] =3D { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x00000ee0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index c6c7d4cd313e..60917c95842b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -14,7 +14,7 @@ #define RTL8192E_PHY_REG_1T2R_ARR_LEN 296 extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN]; #define RTL8192E_RADIO_A_ARR_LEN 246 -extern u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN]; +extern u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN]; #define RTL8192E_RADIO_B_ARR_LEN 78 extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN]; #define RTL8192E_MACPHY_ARR_LEN 18 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 56546C74A44 for ; Tue, 14 Mar 2023 18:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230480AbjCNSom (ORCPT ); Tue, 14 Mar 2023 14:44:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230215AbjCNSog (ORCPT ); Tue, 14 Mar 2023 14:44:36 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1D142B604 for ; Tue, 14 Mar 2023 11:44:11 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id x13so18651596edd.1 for ; Tue, 14 Mar 2023 11:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819450; x=1681411450; 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=dX/61Oavue+o3+oO8HANeoCLyyVoQ/bbCU3a8t7lgHo=; b=AqeMvcLOgpXAE1QCwYtotjQd5VIjFkg25rhw5E3x23CUlSG4uIaC4Gt5aq8iz4zwCF enm6jsMoUxqK7byRivsVK6DrRBqrgMHG/EYi/uKh8Ltb8DISzcWfASGrICQhPIlBacIw sUvT9Uq5edYcIN350R+OncDWmUvBcsw4rie/pP8rncfWQwHXsPKZAqd0nNnLEoAMsOi6 XmFDY/OlcA6Hn0GM5afV/ko+tGeYqVP8EMGEFbKgBrRy9xJ64BDIW7I6IUlqi4epziS7 VwpYutR3PMikDI5jRALsb+3vHNflp08A7FL6Tm197rwTCdZKYpw9QUcF+/f81+a+62LC pTpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819450; x=1681411450; 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=dX/61Oavue+o3+oO8HANeoCLyyVoQ/bbCU3a8t7lgHo=; b=sJ/6TcHxfKVx31locGBTP6NAlSHzjyCQ6xgh3h7HfslwrRrGhDm06ZQQA3639q7MaI DQRXALJMyEhnzxdSOgI5oaqx3oF6/ttfxe97FqYBtOz2YD1vNRs3SQdwBV4odCEULUCo XdUPmNOFHQTBh0wzTHLci+5vsVi8/XhcqglydLM9RtSS0uLNDfQhycuI5PR6F4LNtHxc E1Eeawy4OzUOxqwRfE0JJ3VjfJrRCXY9sd0lNQFXf/ElhjAMRozUfiPGzIUpEkFT2lcv EikssvBMiO5eKey5JMP3g4z/6j/9ndf22hauLdIWx8M3ro7Hi392wLUf4U3abA1vAosa e8qg== X-Gm-Message-State: AO0yUKXu3G0HOWbWsB1XxbDya7SxwaDWCYcbcbruiEkuXoHsWtv9r+Yj crCFPka2UwKJ4/9RjMrgHjPzTf+J47c= X-Google-Smtp-Source: AK7set+A1i7xFo2FTYFM1nHnN8PpvZpZemKGl8ZaNubUq1vQFhgeiKZik9WLyfjuK4KWSf8lLNpZsQ== X-Received: by 2002:a17:906:738f:b0:8aa:c0d5:25b1 with SMTP id f15-20020a170906738f00b008aac0d525b1mr864003ejl.5.1678819449782; Tue, 14 Mar 2023 11:44:09 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id rq4-20020a17090788c400b00927341bf69dsm1467525ejc.88.2023.03.14.11.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:44:09 -0700 (PDT) Date: Tue, 14 Mar 2023 19:44:07 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/12] staging: rtl8192e: Join constants Rtl819XRadioB_.. with ..RadioB_.. Message-ID: <59af481400d5f7633bcaf7fcd95b7e5f0093fd3f.1678814935.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" Join constants Rtl819XRadioB_Array with Rtl8192PciERadioB_Array to RTL8192E_RADIO_B_ARR to improve readability. Fix spaces around '+' to improve coding style. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 49fdaacb788a..5b9a1b78c35e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -555,13 +555,13 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum= rf90_radio_path eRFPath) break; case RF90_PATH_B: for (i =3D 0; i < RTL8192E_RADIO_B_ARR_LEN; i +=3D 2) { - if (Rtl819XRadioB_Array[i] =3D=3D 0xfe) { + if (RTL8192E_RADIO_B_ARR[i] =3D=3D 0xfe) { msleep(100); continue; } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioB_Array[i], + rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_B_ARR[i], bMask12Bits, - Rtl819XRadioB_Array[i+1]); + RTL8192E_RADIO_B_ARR[i + 1]); =20 } break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 74c7850e514c..ee91d687de9b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array #define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array #define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index 4f36a480f6f2..eeea01681e7d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -283,7 +283,7 @@ u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN] =3D { 0x007, 0x00000700, }; =20 -u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] =3D { +u32 RTL8192E_RADIO_B_ARR[RTL8192E_RADIO_B_ARR_LEN] =3D { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x000006e0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index 60917c95842b..3023440db58b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -16,7 +16,7 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_= 1T2R_ARR_LEN]; #define RTL8192E_RADIO_A_ARR_LEN 246 extern u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN]; #define RTL8192E_RADIO_B_ARR_LEN 78 -extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN]; +extern u32 RTL8192E_RADIO_B_ARR[RTL8192E_RADIO_B_ARR_LEN]; #define RTL8192E_MACPHY_ARR_LEN 18 extern u32 RTL8192E_MACPHY_ARR[RTL8192E_MACPHY_ARR_LEN]; #define RTL8192E_MACPHY_ARR_PG_LEN 30 --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 18B53C05027 for ; Tue, 14 Mar 2023 18:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230461AbjCNSow (ORCPT ); Tue, 14 Mar 2023 14:44:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230402AbjCNSoo (ORCPT ); Tue, 14 Mar 2023 14:44:44 -0400 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EE7C6484E for ; Tue, 14 Mar 2023 11:44:18 -0700 (PDT) Received: by mail-ed1-x52e.google.com with SMTP id x3so65921866edb.10 for ; Tue, 14 Mar 2023 11:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819456; 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=1uYehhFxzaCa8Hl58SvBTbiOvy8bevbMRIqLTRcQvkQ=; b=N/LmTvq7X+nRe2JHw29SHzuBzeOBVva84SwRCBlM1v1VB+ubXcfM/EobdmY2E+Ftju 7lYP7NXN+Im4llj/isNQkUuCQulsbm/puPMAhmGP6SyCbRqoPrceJ1HbPkg2gxxxxqkI ieY/8dRminCQYwN1wYjOGTr2kXDmPM4FpyHL/V7/dwwNECFYXTQvd7V0DfrK11AyuQmz z8WIhkYQtRF0BvHuXQQ2j6QYyKknP08vvv/gDChyQiBzFrJqWchzV73Hj6d6flIbd2J+ Nyo/gZAM8Z42oJuyeDaZYQZt4R0uWqAJ6e3cTIi5KgkeKoTjB7A+tXSwwxcWhrnnHuGx MEUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819456; 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=1uYehhFxzaCa8Hl58SvBTbiOvy8bevbMRIqLTRcQvkQ=; b=mig4H7atUVx8FbBEe+z9ySyzO25Biat3d1bFTL1q4buS53PODVLPfHf3J4juAMPQou ESbe68HnAvwbAib7hXEfrgnOUwc4G3TUbwFkaePQwoUwcaDp2mEB0rnmgyqXGJji4PM6 l+HcgMz0aVOAq4fxoVSctdae89fFBNXpZi3TqXtd30cIt73JPpN2VjFqlA5Xjjp+rTcI ABKYATwWiguyPkv46lsFea5/BbRBNnyI8CpOfpuN5hbPcuNwoi0wDzdaPg2gDEwwL13a pz5u53O9F5DA/7fN7fXcG0XRhhGhweyNNbhUwv3nwR/vukAAJ2xVlcPoIahMjI/CjS04 t4Rw== X-Gm-Message-State: AO0yUKWsGjdRaZcbcIcWVxwhTB/d70qvMrFWu9dwfXfJKfmBslbBKnkm bD2isKIIlDVX9iK/30gumlc= X-Google-Smtp-Source: AK7set9EJI7caBb11E17/HYnwlTHxtENxZhzCtH7X5thnn/UTA5z8fozcdQHGCfGPBWxZZhYc+LKSw== X-Received: by 2002:a05:6402:280b:b0:4bc:235c:dcb8 with SMTP id h11-20020a056402280b00b004bc235cdcb8mr16454919ede.1.1678819456076; Tue, 14 Mar 2023 11:44:16 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id r9-20020a50c009000000b004c13fe8fabfsm1416835edb.84.2023.03.14.11.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:44:15 -0700 (PDT) Date: Tue, 14 Mar 2023 19:44:13 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/12] staging: rtl8192e: Join constants Rtl819XAGCTAB_.. with ..PciEAGCTAB.. 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" Join constants Rtl819XAGCTAB_Array with Rtl8192PciEAGCTAB_Array to RTL8192E_AGCTAB_ARR to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 - drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 5b9a1b78c35e..72ecdb9ea375 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -313,7 +313,7 @@ static void _rtl92e_phy_config_bb(struct net_device *de= v, u8 ConfigType) struct r8192_priv *priv =3D rtllib_priv(dev); =20 AGCTAB_ArrayLen =3D RTL8192E_AGCTAB_ARR_LEN; - Rtl819XAGCTAB_Array_Table =3D Rtl819XAGCTAB_Array; + Rtl819XAGCTAB_Array_Table =3D RTL8192E_AGCTAB_ARR; if (priv->rf_type =3D=3D RF_1T2R) { PHY_REGArrayLen =3D RTL8192E_PHY_REG_1T2R_ARR_LEN; Rtl819XPHY_REGArray_Table =3D Rtl819XPHY_REG_1T2RArray; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index ee91d687de9b..1f9bafd6d3cc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,7 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array #define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray =20 extern u32 rtl819XAGCTAB_Array[]; diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index eeea01681e7d..3a7656facefc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -347,7 +347,7 @@ u32 RTL8192E_MACPHY_ARR_PG[] =3D { 0x318, 0x00000fff, 0x00000800, }; =20 -u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN] =3D { +u32 RTL8192E_AGCTAB_ARR[RTL8192E_AGCTAB_ARR_LEN] =3D { 0xc78, 0x7d000001, 0xc78, 0x7d010001, 0xc78, 0x7d020001, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index 3023440db58b..576228882c21 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -22,6 +22,6 @@ extern u32 RTL8192E_MACPHY_ARR[RTL8192E_MACPHY_ARR_LEN]; #define RTL8192E_MACPHY_ARR_PG_LEN 30 extern u32 RTL8192E_MACPHY_ARR_PG[RTL8192E_MACPHY_ARR_PG_LEN]; #define RTL8192E_AGCTAB_ARR_LEN 384 -extern u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN]; +extern u32 RTL8192E_AGCTAB_ARR[RTL8192E_AGCTAB_ARR_LEN]; =20 #endif --=20 2.39.2 From nobody Wed Feb 11 13:05:40 2026 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 98DE3C6FD1F for ; Tue, 14 Mar 2023 18:45:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229532AbjCNSpJ (ORCPT ); Tue, 14 Mar 2023 14:45:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230358AbjCNSot (ORCPT ); Tue, 14 Mar 2023 14:44:49 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB6D424493 for ; Tue, 14 Mar 2023 11:44:25 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id ek18so34825189edb.6 for ; Tue, 14 Mar 2023 11:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678819462; 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=bLOK37kaCCRFSQ6Qfe95p7DC41DH+xkXW4p/2GEywPo=; b=o5rcG3ReV5MD3ATMvPIYIfyLf0tGNylYLK6uBZxngMMr3PGyyQrrvif8+lWI8KVBHg DqGsDsfiCtzL7vAnFb2N7jGCcBiaGmZ4cAoRqm2fkBq7lexgOmgzUa7cojefENXzd1hT ksSLBEiJTlzGP6wWgBOWuD08DviRn+JgAdF9OTXNalT4EGOpDIovQ5YKPWh5jwGgzZS5 EMLL5VlOC+stUBVUX4akXIDRcjZsIR5JY2Lhww9EQeeUe1zchSLr1stcFdqrBcH0ZWE/ qXgcFm+m9+OAkoSxnIdjSobknk/7ZruvnUwkTNNQ1qs+4X9uyO512DB0jRuihET3Q/OJ JNSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678819462; 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=bLOK37kaCCRFSQ6Qfe95p7DC41DH+xkXW4p/2GEywPo=; b=p6ttFCwmhdnuuC4bpSrmkfQBSXdZE6WX1uWtVhjsXAiEdDsB9VVubUWUj5WRvzPy1r VR8DPawJCOFOdXPqmrFn5aC/6cpnabJGlKJM2xWRi2l4dNxueO48cBL4dAd3/eKvOS+X fLkTU2Xcp19UIUL1rfvU95v5XyrWzEbGXeSQB01EHe3hrcE3QY5eVXMNVNMj5CzAd7EW +26gJgS099VZhVlQWPQli2xqngtYVuiCC8OaVdPVXmdtBqRw8JRbyEKw6cm3baNqFEUH XQuHCl+tnae4rVzNvHHCypwgzepN4FrO/KjoFdd9rI9o7NtMdiSbefDPSTIg23YH5MXJ hwWA== X-Gm-Message-State: AO0yUKUo2qQMe3TA9EwvRR0IbilPM40HZmTwgpURwSqBAkPn9zKlIpr1 /C2w6de1pJeaXt8CxCQfIi7PBREA6Os= X-Google-Smtp-Source: AK7set8sc29DTAjORv8IgrLZDEPnHQwqE8NefI67oQBQEvJxfDt7dYpNCX3Q82APCNeRdWkS3/e7aA== X-Received: by 2002:a05:6402:268e:b0:4bc:edde:14dd with SMTP id w14-20020a056402268e00b004bcedde14ddmr20474290edd.0.1678819462676; Tue, 14 Mar 2023 11:44:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935146.dip0.t-ipconnect.de. [87.147.81.70]) by smtp.gmail.com with ESMTPSA id g8-20020aa7d1c8000000b004be11e97ca2sm1400647edp.90.2023.03.14.11.44.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 11:44:22 -0700 (PDT) Date: Tue, 14 Mar 2023 19:44:20 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 12/12] staging: rtl8192e: Join constants Rtl819XPHY_REG_.. with ..PciEPHY_REG_.. Message-ID: <2816a10a8a534014c58e0092b78443e01a67930a.1678814935.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" Join constants Rtl819XPHY_REG_1T2RArray with Rtl8192PciEPHY_REG_1T2RArray to RTL8192E_PHY_REG_1T2R_ARR to improve readability. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 -- drivers/staging/rtl8192e/rtl8192e/table.c | 2 +- drivers/staging/rtl8192e/rtl8192e/table.h | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 72ecdb9ea375..2dbddf4ae3d6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -316,7 +316,7 @@ static void _rtl92e_phy_config_bb(struct net_device *de= v, u8 ConfigType) Rtl819XAGCTAB_Array_Table =3D RTL8192E_AGCTAB_ARR; if (priv->rf_type =3D=3D RF_1T2R) { PHY_REGArrayLen =3D RTL8192E_PHY_REG_1T2R_ARR_LEN; - Rtl819XPHY_REGArray_Table =3D Rtl819XPHY_REG_1T2RArray; + Rtl819XPHY_REGArray_Table =3D RTL8192E_PHY_REG_1T2R_ARR; } =20 if (ConfigType =3D=3D BB_CONFIG_PHY_REG) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 1f9bafd6d3cc..6723fcce8954 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,8 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray - extern u32 rtl819XAGCTAB_Array[]; =20 enum hw90_block { diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rt= l8192e/rtl8192e/table.c index 3a7656facefc..0b5cc6049232 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -6,7 +6,7 @@ */ #include "table.h" =20 -u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN] =3D { +u32 RTL8192E_PHY_REG_1T2R_ARR[RTL8192E_PHY_REG_1T2R_ARR_LEN] =3D { 0x800, 0x00000000, 0x804, 0x00000001, 0x808, 0x0000fc00, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rt= l8192e/rtl8192e/table.h index 576228882c21..82be44a9d4e8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/table.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -12,7 +12,7 @@ #include =20 #define RTL8192E_PHY_REG_1T2R_ARR_LEN 296 -extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN]; +extern u32 RTL8192E_PHY_REG_1T2R_ARR[RTL8192E_PHY_REG_1T2R_ARR_LEN]; #define RTL8192E_RADIO_A_ARR_LEN 246 extern u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN]; #define RTL8192E_RADIO_B_ARR_LEN 78 --=20 2.39.2