From nobody Wed Feb 11 14:26:24 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