From nobody Thu Apr 9 12:05:22 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 74570C433FE for ; Sat, 5 Nov 2022 10:01:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229838AbiKEKB2 (ORCPT ); Sat, 5 Nov 2022 06:01:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229804AbiKEKA6 (ORCPT ); Sat, 5 Nov 2022 06:00:58 -0400 Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA9AF1B7AD for ; Sat, 5 Nov 2022 03:00:37 -0700 (PDT) Received: by mail-pf1-x436.google.com with SMTP id 130so6530573pfu.8 for ; Sat, 05 Nov 2022 03:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XN+Q6Uz1Z9DwS84wbHOEHzmi43ielaLqgyLWhdiQqew=; b=o5A5u5daMFJL++Meu5sS/4v9h5ZyKnWOP8C88b2usKWcCwS6okUg6MZVmJ4h3fBI25 FhWx5cVKSjykvY6pW13uKHt7+PdnDWrQxPHxeIZx/JDOY1QWHWDK0lLS0tls7qYRQMfw CBEEhgG/L3zp1j921NLytdE/1pTNpBKx2uD6n8V6dbBiZCbISZhKWocZz02y/d9Rb2WN Y+/+gPkoK6jqsHXULFzOiwR0pxJcTQagLboGKNVfepIUp0D6LZhTPYdX17CKuhXV4/tc 8BVoTJm/M1pf4TkQBHoUleVJW3ZP/xCVbo2w4Wh8gyDuuT8tDtSkLbC2Q0r10vrS/x4O kf5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XN+Q6Uz1Z9DwS84wbHOEHzmi43ielaLqgyLWhdiQqew=; b=4Sh3ESM7gRUwmmkzv52r58PQBAdSITS7kWfUoUY4C3OCAC6iLR/A9KHHtVAhvtaa8q A2x/g9En7abmmuuH7eoVNuBOCU01dyXz+qBn0otJP0U5tf830n3be3l0eYTC4hckTuQO EdxEaxnBmX34DukbJ9L4CxXLze4XP2dkPExoEUDUi/caOKijDPm9Uylr0Y/ZNjztGF4K lwYiWkos7bZqqB0MHBn8vyMSFLs9hPdjoAB5svVyz63rBFAhcfrYg/P5bUVRuFq3g26g IcOb71Saqx7LpRWK9UJmls9qeIaBfrdRzM974qC5DYBsK3j+dygX+t22+OC0HkAv7RRH tw8w== X-Gm-Message-State: ACrzQf2kB1aBpybSygDPetys7TcvW5pcuIu15MzOHS9nc/MjlvYWcorJ lEV2k8RrJ6jVCNL2r8uNwPo= X-Google-Smtp-Source: AMsMyM6VpOk5u5udnqpgvp7vbQL4x/nwng9LSNt1SlgyqGQHI+wDJQpYGlpBR4tbR/5Zp9jw8LjKCQ== X-Received: by 2002:a63:85c8:0:b0:46e:c387:c85f with SMTP id u191-20020a6385c8000000b0046ec387c85fmr33929968pgd.105.1667642437401; Sat, 05 Nov 2022 03:00:37 -0700 (PDT) Received: from jacob-Ubuntu (126.224.215.218.sta.wbroadband.net.au. [218.215.224.126]) by smtp.gmail.com with ESMTPSA id x190-20020a6231c7000000b0056bbebbcafbsm976780pfx.100.2022.11.05.03.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 03:00:37 -0700 (PDT) From: Jacob Bai To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Jacob Bai Subject: [PATCH 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c Date: Sat, 5 Nov 2022 21:00:28 +1100 Message-Id: <01eb4d9cb22be5f76aa39eedd406577cdfd9f486.1667641211.git.jacob.bai.au@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" fix camel case issue. Signed-off-by: Jacob Bai --- .../staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 18 +++++----- .../staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 36 +++++++++---------- .../staging/rtl8192e/rtl8192e/r8192E_phy.h | 36 +++++++++---------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/sta= ging/rtl8192e/rtl8192e/r8192E_hwimg.c index e6fce749e65b..8920283f340e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c @@ -6,9 +6,9 @@ */ #include "r8192E_hwimg.h" =20 -u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE] =3D {0x0,}; +u32 RTL8192E_PHY_REG_ARRAY[RTL8192E_PHY_REG_ARRAY_LEN] =3D {0x0,}; =20 -u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] =3D { +u32 RTL8192E_PHY_REG_1T2R_ARRAY[RTL8192E_PHY_REG_1T2R_ARRAY_LEN] =3D { 0x800, 0x00000000, 0x804, 0x00000001, 0x808, 0x0000fc00, @@ -159,7 +159,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengt= hPciE] =3D { 0xe1c, 0x12121416, }; =20 -u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] =3D { +u32 RTL8192E_RADIOA_ARRAY[RTL8192E_RADIOA_ARRAY_LEN] =3D { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x00000ee0, @@ -285,7 +285,7 @@ u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] =3D= { 0x007, 0x00000700, }; =20 -u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] =3D { +u32 RTL8192E_RADIOB_ARRAY[RTL8192E_RADIOB_ARRAY_LEN] =3D { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x000006e0, @@ -327,13 +327,13 @@ u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = =3D { 0x007, 0x00000700, }; =20 -u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE] =3D { +u32 RTL8192E_RADIOC_ARRAY[RTL8192E_RADIOC_ARRAY_LEN] =3D { 0x0, }; =20 -u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE] =3D { +u32 RTL8192E_RADIOD_ARRAY[RTL8192E_RADIOD_ARRAY_LEN] =3D { 0x0, }; =20 -u32 Rtl8192PciEMACPHY_Array[] =3D { +u32 RTL8192E_MAC_ARRAY[RTL8192E_MAC_ARRAY_LEN] =3D { 0x03c, 0xffff0000, 0x00000f0f, 0x340, 0xffffffff, 0x161a1a1a, 0x344, 0xffffffff, 0x12121416, @@ -342,7 +342,7 @@ u32 Rtl8192PciEMACPHY_Array[] =3D { 0x318, 0x00000fff, 0x00000100, }; =20 -u32 Rtl8192PciEMACPHY_Array_PG[] =3D { +u32 RTL8192E_MAC_ARRAY_PG[RTL8192E_MAC_ARRAY_PG_LEN] =3D { 0x03c, 0xffff0000, 0x00000f0f, 0xe00, 0xffffffff, 0x06090909, 0xe04, 0xffffffff, 0x00030306, @@ -355,7 +355,7 @@ u32 Rtl8192PciEMACPHY_Array_PG[] =3D { 0x318, 0x00000fff, 0x00000800, }; =20 -u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE] =3D { +u32 RTL8192E_AGC_TAB_ARRAY[RTL8192E_AGC_TAB_ARRAY_LEN] =3D { 0xc78, 0x7d000001, 0xc78, 0x7d010001, 0xc78, 0x7d020001, diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h b/drivers/sta= ging/rtl8192e/rtl8192e/r8192E_hwimg.h index 7d63f5a5c1b7..a436c089a779 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h @@ -11,23 +11,23 @@ =20 #include =20 -#define PHY_REGArrayLengthPciE 1 -extern u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE]; -#define PHY_REG_1T2RArrayLengthPciE 296 -extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE]; -#define RadioA_ArrayLengthPciE 246 -extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE]; -#define RadioB_ArrayLengthPciE 78 -extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE]; -#define RadioC_ArrayLengthPciE 2 -extern u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE]; -#define RadioD_ArrayLengthPciE 2 -extern u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE]; -#define MACPHY_ArrayLengthPciE 18 -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_PHY_REG_ARRAY_LEN 1 +extern u32 RTL8192E_PHY_REG_ARRAY[RTL8192E_PHY_REG_ARRAY_LEN]; +#define RTL8192E_PHY_REG_1T2R_ARRAY_LEN 296 +extern u32 RTL8192E_PHY_REG_1T2R_ARRAY[RTL8192E_PHY_REG_1T2R_ARRAY_LEN]; +#define RTL8192E_RADIOA_ARRAY_LEN 246 +extern u32 RTL8192E_RADIOA_ARRAY[RTL8192E_RADIOA_ARRAY_LEN]; +#define RTL8192E_RADIOB_ARRAY_LEN 78 +extern u32 RTL8192E_RADIOB_ARRAY[RTL8192E_RADIOB_ARRAY_LEN]; +#define RTL8192E_RADIOC_ARRAY_LEN 2 +extern u32 RTL8192E_RADIOC_ARRAY[RTL8192E_RADIOC_ARRAY_LEN]; +#define RTL8192E_RADIOD_ARRAY_LEN 2 +extern u32 RTL8192E_RADIOD_ARRAY[RTL8192E_RADIOD_ARRAY_LEN]; +#define RTL8192E_MAC_ARRAY_LEN 18 +extern u32 RTL8192E_MAC_ARRAY[RTL8192E_MAC_ARRAY_LEN]; +#define RTL8192E_MAC_ARRAY_PG_LEN 30 +extern u32 RTL8192E_MAC_ARRAY_PG[RTL8192E_MAC_ARRAY_PG_LEN]; +#define RTL8192E_AGC_TAB_ARRAY_LEN 384 +extern u32 RTL8192E_AGC_TAB_ARRAY[RTL8192E_AGC_TAB_ARRAY_LEN]; =20 #endif diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 75629f5df954..e1c1f19b71a3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,25 +9,25 @@ =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 -#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE -#define RadioC_ArrayLength RadioC_ArrayLengthPciE -#define RadioD_ArrayLength RadioD_ArrayLengthPciE -#define PHY_REGArrayLength PHY_REGArrayLengthPciE -#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE +#define AGCTAB_ArrayLength RTL8192E_AGC_TAB_ARRAY_LEN +#define MACPHY_ArrayLength RTL8192E_MAC_ARRAY_LEN +#define RadioA_ArrayLength RTL8192E_RADIOA_ARRAY_LEN +#define RadioB_ArrayLength RTL8192E_RADIOB_ARRAY_LEN +#define MACPHY_Array_PGLength RTL8192E_MAC_ARRAY_PG_LEN +#define RadioC_ArrayLength RTL8192E_RADIOC_ARRAY_LEN +#define RadioD_ArrayLength RTL8192E_RADIOD_ARRAY_LEN +#define PHY_REGArrayLength RTL8192E_PHY_REG_ARRAY_LEN +#define PHY_REG_1T2RArrayLength RTL8192E_PHY_REG_1T2R_ARRAY_LEN =20 -#define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG -#define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array -#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array -#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array -#define Rtl819XRadioC_Array Rtl8192PciERadioC_Array -#define Rtl819XRadioD_Array Rtl8192PciERadioD_Array -#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array -#define Rtl819XPHY_REGArray Rtl8192PciEPHY_REGArray -#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray +#define Rtl819XMACPHY_Array_PG RTL8192E_MAC_ARRAY_PG +#define Rtl819XMACPHY_Array RTL8192E_MAC_ARRAY +#define Rtl819XRadioA_Array RTL8192E_RADIOA_ARRAY +#define Rtl819XRadioB_Array RTL8192E_RADIOB_ARRAY +#define Rtl819XRadioC_Array RTL8192E_RADIOC_ARRAY +#define Rtl819XRadioD_Array RTL8192E_RADIOD_ARRAY +#define Rtl819XAGCTAB_Array RTL8192E_AGC_TAB_ARRAY +#define Rtl819XPHY_REGArray RTL8192E_PHY_REG_ARRAY +#define Rtl819XPHY_REG_1T2RArray RTL8192E_PHY_REG_1T2R_ARRAY =20 extern u32 rtl819XAGCTAB_Array[]; =20 --=20 2.34.1 From nobody Thu Apr 9 12:05:22 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 390FBC433FE for ; Sat, 5 Nov 2022 10:01:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229870AbiKEKBc (ORCPT ); Sat, 5 Nov 2022 06:01:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229805AbiKEKBA (ORCPT ); Sat, 5 Nov 2022 06:01:00 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD04A1C11C for ; Sat, 5 Nov 2022 03:00:41 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id c2so6978059plz.11 for ; Sat, 05 Nov 2022 03:00:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1WNb21Jb0qdnUTEVIzTSpsX7MkahQuwX4NfPZNy1VsM=; b=coUxiydd73lN9DqlJUDE3bnZQi0s8Zji7APuZcY2TlMjEgZ9kyKnxhmtgbI4TavDas OEwzfKyNa+pA/zFyp0BdnM/FudzJ1T/3I/klUwyLbkkRwJN/P6PzQOtNQoOI3OwUX/TZ rJXixGmeuy95VgYGi/+RzPsxpJECl7MBF/G304pbLfNEOYdIoZbEwJASYSxaJ+gTF38/ pr4wUpC+S8D9YlvoEcfT5Q4dLmpU91KYWSaA/FqTa5DejQPmzEuSrH9MXmQ31YbmISPO v9MQGG/In+b2WGyTCt4B7/OIRQMlFwQYYkkfod0HvrrRa+1z5316cFjJ9PkjJ/5AW5Qa GEng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1WNb21Jb0qdnUTEVIzTSpsX7MkahQuwX4NfPZNy1VsM=; b=iTjD28QO/iRH//gGqaoa5pyg9qcUPCYD5StN9vxL9LyvrUp5s9dPjplTu+z5EWxErY xd6qU+7Xj5ABdjd1z9/ejWUez+3niN2SstLqg+z53yq+miSJvl/wjfHG6hgL/bhB/5yU nKDk5SU0EKUByRZ88Dzr0QfRN71k/HljDJrPPj9AhlFI2UxVWJVUgyxezSE1/AVatX6+ 1M2xInaH8imdBQQlR7uHSCy6fn021cLzEFHq3yY/ny6HQTaPWMEcvHf196qFaKysx7/s AaHrAtSnqYwtjFlNuzMxEL4RFCG5STFRkE7stTADxNazv0z030XNAUV3C8UUdv3n/3CL pORA== X-Gm-Message-State: ACrzQf0bdSqFXeoSIWlrkTtTsYkuwqbm04AYyXqQ30LZN6nzqdIRDZkF BTmOAn1L/84PS6cWAxFeqfY= X-Google-Smtp-Source: AMsMyM6++hDGURvzzjN23uo1p8EaaFyn2W3q4gExU1BiJuxMzSVb+CVn7CYaUuWq2F+4/tX9gLVvGg== X-Received: by 2002:a17:902:a606:b0:178:57e4:a0c1 with SMTP id u6-20020a170902a60600b0017857e4a0c1mr39760979plq.83.1667642441220; Sat, 05 Nov 2022 03:00:41 -0700 (PDT) Received: from jacob-Ubuntu (126.224.215.218.sta.wbroadband.net.au. [218.215.224.126]) by smtp.gmail.com with ESMTPSA id ij22-20020a170902ab5600b0017f36638010sm1261363plb.276.2022.11.05.03.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 03:00:40 -0700 (PDT) From: Jacob Bai To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Jacob Bai Subject: [PATCH 2/3] staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h Date: Sat, 5 Nov 2022 21:00:29 +1100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Same as other rtlwifi frivers, use table.c/h. Signed-off-by: Jacob Bai --- drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c =3D> table.c} | 2 +- drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.h =3D> table.h} | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c =3D> table.c} (99= %) rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.h =3D> table.h} (94= %) diff --git a/drivers/staging/rtl8192e/rtl8192e/Makefile b/drivers/staging/r= tl8192e/rtl8192e/Makefile index 75e6ec510555..334d92efd4ba 100644 --- a/drivers/staging/rtl8192e/rtl8192e/Makefile +++ b/drivers/staging/rtl8192e/rtl8192e/Makefile @@ -4,7 +4,7 @@ r8192e_pci-objs :=3D \ r8192E_phy.o \ r8192E_firmware.o \ r8192E_cmdpkt.o \ - r8192E_hwimg.o \ + table.o \ r8190P_rtl8256.o \ rtl_cam.o \ rtl_core.o \ diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 58da2dab55bd..eabb4187d907 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -12,7 +12,7 @@ #include "r8192E_phy.h" #include "rtl_dm.h" =20 -#include "r8192E_hwimg.h" +#include "table.h" =20 static u32 RF_CHANNEL_TABLE_ZEBRA[] =3D { 0, diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/sta= ging/rtl8192e/rtl8192e/table.c similarity index 99% rename from drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c rename to drivers/staging/rtl8192e/rtl8192e/table.c index 8920283f340e..2e75f40db874 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c +++ b/drivers/staging/rtl8192e/rtl8192e/table.c @@ -4,7 +4,7 @@ * * Contact Information: wlanfae */ -#include "r8192E_hwimg.h" +#include "table.h" =20 u32 RTL8192E_PHY_REG_ARRAY[RTL8192E_PHY_REG_ARRAY_LEN] =3D {0x0,}; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h b/drivers/sta= ging/rtl8192e/rtl8192e/table.h similarity index 94% rename from drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h rename to drivers/staging/rtl8192e/rtl8192e/table.h index a436c089a779..a80176c47127 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h +++ b/drivers/staging/rtl8192e/rtl8192e/table.h @@ -4,8 +4,8 @@ * * Contact Information: wlanfae */ -#ifndef __INC_HAL8192PciE_FW_IMG_H -#define __INC_HAL8192PciE_FW_IMG_H +#ifndef __RTL8192E_TABLE__H_ +#define __RTL8192E_TABLE__H_ =20 /*Created on 2008/11/18, 3: 7*/ =20 --=20 2.34.1 From nobody Thu Apr 9 12:05:22 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 A552EC4332F for ; Sat, 5 Nov 2022 10:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbiKEKBn (ORCPT ); Sat, 5 Nov 2022 06:01:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbiKEKBB (ORCPT ); Sat, 5 Nov 2022 06:01:01 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C826A1A81A for ; Sat, 5 Nov 2022 03:00:45 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id j12so6999227plj.5 for ; Sat, 05 Nov 2022 03:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JToYLUSSy/i5m9Py7IH/T54uqRiJj7SvKEgsJsBwYtc=; b=YgwCtTuZYJ//lmjh+GHpYXIMqFSoQBNpDazWKHjIbdxv+yjFzv4LYnSYD5XzEMuE5Z 7StXWVhGbbNgbASn+odYhDRCP8sh+YBMDSEtecU9794/EGNp+PMatucq2fqpVY2l1tYQ 97u10QeplCBvqrHSUngVSwUSrUgW2PoNZwSwT+9ETfki+ZS4CV1RPYvUP+R5qkb86pB2 ZhAEh3Kl3o3ekdml9cHjP5ZYkbyd1D7jE9V09NWL5fpae7n/LUl4lq9mujCMf++9wQOD MQnitSMwn486VycY2O+XVUcAqPoaSvheFfw7HnDAYQA2hqFcjPYECafdIK09O0fMgkqh 6Qdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JToYLUSSy/i5m9Py7IH/T54uqRiJj7SvKEgsJsBwYtc=; b=aWKWj4iYvy2KI1+NMdPE/K+h/8RpmfYYQ/qXJBvR0RpLblIaTNz18wnNmK+vYldXS2 BCO3g6XzOxz83p6CLFYM/98bRpdWuVkTD2lYod46XyKy7Bpphh8/bKe52ZFGhfqt8/dC U3x2mkmKLUjDrUERPjrT/RK+x8QGdKDPLX2GtLWwoHDyHr+olxv1yt1BumfXKcf3yH39 nLYcPy3u6RBTLanKE9g8eth2OdPpXXuPNYqKGNmBxcgT97CYpc6MVR58IJWDH5AILqAG iDMvAne9R1aVVaIOcVFzSMueE+IIvX/2vEjYFiOZDPedd0UC4gSy/ZrCxoNAMo07IzHX kzqA== X-Gm-Message-State: ACrzQf1XiNxzrUnIKSp/bwow/rLevgoTDGS/Rn0gvgmckomnjmoUG/PC 0OkC280LJhkh17WuLdU2TXU= X-Google-Smtp-Source: AMsMyM4e+mUO4sg6qtsu0zY4bqfOq2cBTeUC3O4Z1WHF+1Z5QBZUgeEwREL/vbd/JeeqREXuicnfWA== X-Received: by 2002:a17:902:d54a:b0:186:e852:6775 with SMTP id z10-20020a170902d54a00b00186e8526775mr39989783plf.44.1667642445183; Sat, 05 Nov 2022 03:00:45 -0700 (PDT) Received: from jacob-Ubuntu (126.224.215.218.sta.wbroadband.net.au. [218.215.224.126]) by smtp.gmail.com with ESMTPSA id h37-20020a635765000000b00412a708f38asm979171pgm.35.2022.11.05.03.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 03:00:44 -0700 (PDT) From: Jacob Bai To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Jacob Bai Subject: [PATCH 3/3] staging: rtl8192e: remove unnecesscary macro define Date: Sat, 5 Nov 2022 21:00:30 +1100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" remove useless macro defines Signed-off-by: Jacob Bai --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 52 +++++++++---------- .../staging/rtl8192e/rtl8192e/r8192E_phy.h | 20 ------- 2 files changed, 26 insertions(+), 46 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index eabb4187d907..aad1842857c0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -307,12 +307,12 @@ void rtl92e_config_mac(struct net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); =20 if (priv->bTXPowerDataReadFromEEPORM) { - dwArrayLen =3D MACPHY_Array_PGLength; - pdwArray =3D Rtl819XMACPHY_Array_PG; + dwArrayLen =3D RTL8192E_MAC_ARRAY_PG_LEN; + pdwArray =3D RTL8192E_MAC_ARRAY_PG; =20 } else { - dwArrayLen =3D MACPHY_ArrayLength; - pdwArray =3D Rtl819XMACPHY_Array; + dwArrayLen =3D RTL8192E_MAC_ARRAY_LEN; + pdwArray =3D RTL8192E_MAC_ARRAY; } for (i =3D 0; i < dwArrayLen; i +=3D 3) { if (pdwArray[i] =3D=3D 0x318) @@ -332,14 +332,14 @@ static void _rtl92e_phy_config_bb(struct net_device *= dev, u8 ConfigType) u16 AGCTAB_ArrayLen, PHY_REGArrayLen =3D 0; struct r8192_priv *priv =3D rtllib_priv(dev); =20 - AGCTAB_ArrayLen =3D AGCTAB_ArrayLength; - Rtl819XAGCTAB_Array_Table =3D Rtl819XAGCTAB_Array; + AGCTAB_ArrayLen =3D RTL8192E_AGC_TAB_ARRAY_LEN; + Rtl819XAGCTAB_Array_Table =3D RTL8192E_AGC_TAB_ARRAY; if (priv->rf_type =3D=3D RF_2T4R) { - PHY_REGArrayLen =3D PHY_REGArrayLength; - Rtl819XPHY_REGArray_Table =3D Rtl819XPHY_REGArray; + PHY_REGArrayLen =3D RTL8192E_PHY_REG_ARRAY_LEN; + Rtl819XPHY_REGArray_Table =3D RTL8192E_PHY_REG_ARRAY; } else if (priv->rf_type =3D=3D RF_1T2R) { - PHY_REGArrayLen =3D PHY_REG_1T2RArrayLength; - Rtl819XPHY_REGArray_Table =3D Rtl819XPHY_REG_1T2RArray; + PHY_REGArrayLen =3D RTL8192E_PHY_REG_1T2R_ARRAY_LEN; + Rtl819XPHY_REGArray_Table =3D RTL8192E_PHY_REG_1T2R_ARRAY; } =20 if (ConfigType =3D=3D BaseBand_Config_PHY_REG) { @@ -668,50 +668,50 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum= rf90_radio_path eRFPath) =20 switch (eRFPath) { case RF90_PATH_A: - for (i =3D 0; i < RadioA_ArrayLength; i +=3D 2) { - if (Rtl819XRadioA_Array[i] =3D=3D 0xfe) { + for (i =3D 0; i < RTL8192E_RADIOA_ARRAY_LEN; i +=3D 2) { + if (RTL8192E_RADIOA_ARRAY[i] =3D=3D 0xfe) { msleep(100); continue; } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioA_Array[i], + rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOA_ARRAY[i], bMask12Bits, - Rtl819XRadioA_Array[i+1]); + RTL8192E_RADIOA_ARRAY[i+1]); =20 } break; case RF90_PATH_B: - for (i =3D 0; i < RadioB_ArrayLength; i +=3D 2) { - if (Rtl819XRadioB_Array[i] =3D=3D 0xfe) { + for (i =3D 0; i < RTL8192E_RADIOB_ARRAY_LEN; i +=3D 2) { + if (RTL8192E_RADIOB_ARRAY[i] =3D=3D 0xfe) { msleep(100); continue; } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioB_Array[i], + rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOB_ARRAY[i], bMask12Bits, - Rtl819XRadioB_Array[i+1]); + RTL8192E_RADIOB_ARRAY[i+1]); =20 } break; case RF90_PATH_C: - for (i =3D 0; i < RadioC_ArrayLength; i +=3D 2) { - if (Rtl819XRadioC_Array[i] =3D=3D 0xfe) { + for (i =3D 0; i < RTL8192E_RADIOC_ARRAY_LEN; i +=3D 2) { + if (RTL8192E_RADIOC_ARRAY[i] =3D=3D 0xfe) { msleep(100); continue; } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioC_Array[i], + rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOC_ARRAY[i], bMask12Bits, - Rtl819XRadioC_Array[i+1]); + RTL8192E_RADIOC_ARRAY[i+1]); =20 } break; case RF90_PATH_D: - for (i =3D 0; i < RadioD_ArrayLength; i +=3D 2) { - if (Rtl819XRadioD_Array[i] =3D=3D 0xfe) { + for (i =3D 0; i < RTL8192E_RADIOD_ARRAY_LEN; i +=3D 2) { + if (RTL8192E_RADIOD_ARRAY[i] =3D=3D 0xfe) { msleep(100); continue; } - rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioD_Array[i], + rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOD_ARRAY[i], bMask12Bits, - Rtl819XRadioD_Array[i+1]); + RTL8192E_RADIOD_ARRAY[i+1]); =20 } break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index e1c1f19b71a3..5e6527e835db 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -9,26 +9,6 @@ =20 #define MAX_DOZE_WAITING_TIMES_9x 64 =20 -#define AGCTAB_ArrayLength RTL8192E_AGC_TAB_ARRAY_LEN -#define MACPHY_ArrayLength RTL8192E_MAC_ARRAY_LEN -#define RadioA_ArrayLength RTL8192E_RADIOA_ARRAY_LEN -#define RadioB_ArrayLength RTL8192E_RADIOB_ARRAY_LEN -#define MACPHY_Array_PGLength RTL8192E_MAC_ARRAY_PG_LEN -#define RadioC_ArrayLength RTL8192E_RADIOC_ARRAY_LEN -#define RadioD_ArrayLength RTL8192E_RADIOD_ARRAY_LEN -#define PHY_REGArrayLength RTL8192E_PHY_REG_ARRAY_LEN -#define PHY_REG_1T2RArrayLength RTL8192E_PHY_REG_1T2R_ARRAY_LEN - -#define Rtl819XMACPHY_Array_PG RTL8192E_MAC_ARRAY_PG -#define Rtl819XMACPHY_Array RTL8192E_MAC_ARRAY -#define Rtl819XRadioA_Array RTL8192E_RADIOA_ARRAY -#define Rtl819XRadioB_Array RTL8192E_RADIOB_ARRAY -#define Rtl819XRadioC_Array RTL8192E_RADIOC_ARRAY -#define Rtl819XRadioD_Array RTL8192E_RADIOD_ARRAY -#define Rtl819XAGCTAB_Array RTL8192E_AGC_TAB_ARRAY -#define Rtl819XPHY_REGArray RTL8192E_PHY_REG_ARRAY -#define Rtl819XPHY_REG_1T2RArray RTL8192E_PHY_REG_1T2R_ARRAY - extern u32 rtl819XAGCTAB_Array[]; =20 enum hw90_block { --=20 2.34.1