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 41F14C4332F for ; Sun, 6 Nov 2022 01:12:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229591AbiKFBL6 (ORCPT ); Sat, 5 Nov 2022 21:11:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229587AbiKFBLz (ORCPT ); Sat, 5 Nov 2022 21:11:55 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87AE8B7D4 for ; Sat, 5 Nov 2022 18:11:54 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id m6so7702338pfb.0 for ; Sat, 05 Nov 2022 18:11:54 -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=lJRUavAgJlRY5aixkL78+mU7fHHMZ7XzcjuhQZ48ULo2VueXubRTP64zOeAdJpSx7X c79u4M3V5lpm+4PiTBnFC3+fp6A+zNRt/i14m/B6Iqdx84Tz3CxyVOwFl9cdLCVOa3bY Z1SfAjc4p2pwZf0e1wLZI2jJ6d5aVJtyGvBxomfHiu94vOmNes18Xrq1HrhWKBfHeF0J OYD1Nq5yDlNu3r/N1DoLFwAsyqYVVd3sPRzx5tEnxFHbo00gQYm4RPqVgPmWBSLJzm8c xEQr7Rw3nDRjDgU+lzjAksaYrJNQFswmEsc1C34FFgzk6mO7SDzJlb1QgOoijosYoVDq 1zqg== 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=ar+WpyeFQpa9YuN/nJnjMmc4VCenRU/Vf2IfAmJHr0e09r3Tf5FVd1IN16i2OqYch1 h3FI4otwqzsghf30IGWCrbIZozhwlJGC3j7+SBsrXWQNoX2CliNSfjohcA51qxA+Si7c QKSvb+UgJ8RAMlocoSAXRJXcJo/9yZ+JY2wKeYf0R4n15qwKX8LNkNM6IBmOETPQwgRO 7NheibGHe7jmL3TmRvQ7DvMZqp582O8n6PlAYV1AuJ90JKbJLgQpYDCAcJ6jR+ohH1VU cm+q25+PY+GF3dPkHB1sK3S51Goy5sCTiIXiBTRu200ZRwJnv8F9qsCRMhfxENTLCJX7 lcpg== X-Gm-Message-State: ACrzQf2kCFDyLTBSsK3jo4lcqWf4ehU/wvrFrrjKkmg+/UgQJEHRk3u0 shFxzKftyMbOL6ohOvmU2QE= X-Google-Smtp-Source: AMsMyM5kj68jKTl7zJ/aA1Gf16DVSOyd2WbUHCoKuyR62mswO0viNDseknW04AQZM3kMKAjn/fosNA== X-Received: by 2002:a63:194b:0:b0:457:7295:8de0 with SMTP id 11-20020a63194b000000b0045772958de0mr37560668pgz.612.1667697113947; Sat, 05 Nov 2022 18:11:53 -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 ij11-20020a170902ab4b00b001853e6d6179sm2254819plb.162.2022.11.05.18.11.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 18:11:53 -0700 (PDT) From: Jacob Bai To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Jacob Bai Subject: [PATCH v2 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c Date: Sun, 6 Nov 2022 12:11:43 +1100 Message-Id: <01eb4d9cb22be5f76aa39eedd406577cdfd9f486.1667694826.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 919DEC433FE for ; Sun, 6 Nov 2022 01:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229614AbiKFBMB (ORCPT ); Sat, 5 Nov 2022 21:12:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbiKFBL7 (ORCPT ); Sat, 5 Nov 2022 21:11:59 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56572B7D2 for ; Sat, 5 Nov 2022 18:11:58 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id z26so7678391pff.1 for ; Sat, 05 Nov 2022 18:11:58 -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=OnBAG5nSkYnNoSht4YTz5XeCkVWk1xhgWCiV2ObcvEs=; b=lW7v+vxutC9KnziINrPnozsp2OexsfiArX3ciL3rtIPuwmcRtMPqUoI33uM2hPFBcU 41m0Yt97lOioui8b6CMl4t/NZ3nJDWn9A5nUW3navTpKK1zHTfeCjTcLxrPPrrrKtAHU MeOtNpYpfVXLS596L0awmAPAV+K2XWdl53DgrTUyVZGRgto1qu57IfbTa5tWyXKCAYsT R6gLk4EAKhMMH1jajEvk617PmprY3Z+4OEfRyHLi7w6by0u7nM5+5x/8yNaBosyv0c10 tA+x9coWlUp6OHBXWcF+axhBGOmz47nnVZkBnuUluA47rCbXRKuLPFxsiFfSGlWZ10NX 1XgQ== 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=OnBAG5nSkYnNoSht4YTz5XeCkVWk1xhgWCiV2ObcvEs=; b=AaHySi4YDLxBb17ZtT87+Jfz7h9cnQGtyCQ0ppRWkVAVpUggwwiHXJWUZ5TgevxYPn C67FmEJDIa15wUDh3hTMPr1qeV/tJvR/vfHhORQFzi5hY9i7WPiZo3dp/VgOFsLzfXgC +3/OAbH1rBV0ZeTsPi+hD9d15DmSsPdCFi1kvDXjcaCIAeMn49dKkJ1UL679c+usI7tv o6vgV2ArGG7sR1r8O+vWpek8mDuSG9c38wWKWaqh6SEJT2QVTz29oTNSqVTXqZeSjxZL xzIueTDOmFTMT/xikd2groRQ9tyvZVr70zEcvt0kr2bBscHsjf1sflXNtzY+aU7m+6On VOkA== X-Gm-Message-State: ACrzQf0JTpy9XTDXpUeBVl3k6bgV/YVMdsRkU1GeR0Q/lswwjyu64lTy L+27MjnQDKP7pkCeq229P6XROsmHYB8fM6NE X-Google-Smtp-Source: AMsMyM5sP2XDMQv6rZwnCdwEOzRoXLcDRR6MJty+e/Lw0zZrZ4j+5uwR7BKsbzp0Jyb3Uv81i7EvdQ== X-Received: by 2002:aa7:83c8:0:b0:56d:8e07:4618 with SMTP id j8-20020aa783c8000000b0056d8e074618mr31473453pfn.33.1667697117807; Sat, 05 Nov 2022 18:11:57 -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 u13-20020a170902714d00b00186b9196cbesm2222806plm.249.2022.11.05.18.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 18:11:57 -0700 (PDT) From: Jacob Bai To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Jacob Bai Subject: [PATCH v2 2/3] staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h Date: Sun, 6 Nov 2022 12:11:44 +1100 Message-Id: <9bb563727915e3f3edd863837608336b99564462.1667694826.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" Same as other rtlwifi drivers, use table.c/h. Signed-off-by: Jacob Bai --- drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 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 ++-- 5 files changed, 6 insertions(+), 6 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_firmware.c b/drivers/= staging/rtl8192e/rtl8192e/r8192E_firmware.c index 789d288d7503..45819f2f2a37 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c @@ -6,7 +6,7 @@ */ #include "rtl_core.h" #include "r8192E_hw.h" -#include "r8192E_hwimg.h" +#include "table.h" #include "r8192E_firmware.h" #include "r8192E_cmdpkt.h" #include 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 A246BC4332F for ; Sun, 6 Nov 2022 01:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229617AbiKFBMI (ORCPT ); Sat, 5 Nov 2022 21:12:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229600AbiKFBMF (ORCPT ); Sat, 5 Nov 2022 21:12:05 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54840B7DE for ; Sat, 5 Nov 2022 18:12:02 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id gw22so7606610pjb.3 for ; Sat, 05 Nov 2022 18:12:02 -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=nXbPp/AMh7o0Q2A0+X5NJgL3T9bThZY7/7i7HS8rVo6kKjLjTn/FSRcAhYvB3W6jJH rNhQ5aHEiPF9TcpWiwnAa30VBvULLkG8uoOTt7BNVZ6jIL9lJrYnONOKH/qhA3J8Dxv8 9F+e3+Eeg+ukNXv5WAQZbljbSgvm4yqLTtPzv3mgjeU6vMfsWTFvmZEdppoY+KazwO1T KnebfvHO0Fm87p4RAOykSEyZdFJX8c+hKpX1ub8vHqBUxBH2c3bex04JO8j4XJCr9uqD dSCUWuPLFZU2GUPiLsEjs73vMCUyItsG5GYZl9qR5r8TaGsBsrZ4LM2ZpA+DN79rEyiK Y+xQ== 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=ThNV/S9dAeSPu0bK5NJU5LUaXGl8OzuS4zVpiFdCgZWhztkRMHMD7+liQM/fK54DGn Q5kwqlQz5cI5EnHfa7kvlLmw49V1hBbzPYHAHxUe+trSVJzlpZGo55ZnBnVAMUg2gVnU AZdvika3/77WR9w/LIDmW27wjjJYzG+40jpkV918GgxoQmtSx7qteoDWQfL1KHaYso6u NxyAYRUDBPa5a88+yNLcymMlqZtLpk3NqOvqisHXIQ2345/l51mN8st9oMQBemQVkz1u ku6Vatw5j3xxn/F8fk47Y/EvIKURA6mlhRMDPIdRHXKXl0HNm04ylfq1LWo99mxNCNea sflg== X-Gm-Message-State: ACrzQf0HTn6OPlmurpbRUij+3F7m+sTjonD6ZhnxmYJe/prmrM1dakYw 8NoLYs/DN8NuXQFU8Bo6jQo= X-Google-Smtp-Source: AMsMyM6pfzTMbdLeJ3m1kBuqAWSCuJdA1Hc1ItS0EElk/2wtXM/xgyCmbaFQbLZJaxYRJS2E3lRisw== X-Received: by 2002:a17:902:d4c3:b0:187:2b8:a4fa with SMTP id o3-20020a170902d4c300b0018702b8a4famr44532801plg.134.1667697121817; Sat, 05 Nov 2022 18:12:01 -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 p27-20020aa79e9b000000b0052d4cb47339sm1823223pfq.151.2022.11.05.18.12.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Nov 2022 18:12:01 -0700 (PDT) From: Jacob Bai To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Jacob Bai Subject: [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines Date: Sun, 6 Nov 2022 12:11:45 +1100 Message-Id: <6cdf838429ca9b553fb572f55a53ec25fa4e5f6a.1667694826.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" 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