From nobody Wed Feb 11 14:22:43 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