From patchwork Tue Mar 14 18:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69786 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1924685wrd; Tue, 14 Mar 2023 11:46:26 -0700 (PDT) X-Google-Smtp-Source: AK7set9zYv0wkiKjL02ModaUNky7sMCaECwCUl/pplhVpmf1R/bhdgYYMUHBjnKuKuHrtAVx/CSl X-Received: by 2002:a62:7b0d:0:b0:625:5769:aee2 with SMTP id w13-20020a627b0d000000b006255769aee2mr3817324pfc.5.1678819585788; Tue, 14 Mar 2023 11:46:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678819585; cv=none; d=google.com; s=arc-20160816; b=v0CF5xu/55wYq9Inl1/Yb4mvGwOtokqWbgRPrt8D4DTeNmjnFucGXoBbkJm+o4Wqpc 6H2TJl9GlFRX6m/GX5CumG++Ve6AXPu4p2+JkKooS/WYxYzSdhPh+N7dwvxGR46c9N6A 2RkVq8DnkqMIJcGYWikbDp71IwMsgMeN5YkNY8N9CK+3DvoTFAnFzGT61ET6t92TPm+w 6J5IFOpWI/t7o9xWMv6oLJ0Ut9caHKfx3F1HS7gZ1Nj4uzVHBZFRiKstQ/iCJWiLE8cZ MQ7cDZ7KhVDzeC3E7IMDlMj90a+5079lQJLlGecyVGQo0WCfZ7zqtfy7Hsy/N7tUOIiE iCUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=Oag7SRyOaaDLTQg5hnswCsWRIe6BhWUvxQa3wS0l66I=; b=ziQleEL4h0mYr23F90odvtE02q0TsvvuEhBCMnc+M5K016SpVhAj1OfL93wtJd9jlu 1ROYDVOe9AJJJYN75b6Eqi/6kJRG5M15tl2NkshyNSlGPKf6BjkRY9Mr5ul3btMfKTFv oC+vd3Uxj9XDB8hsG/Fp9Hs1WrN8EaRvmsK7+OpdOPqjaPEadBtaO0+sZjUfFBtvT4Ku Nccxvy2/ERl/lNEwpvWVKC9PJprAJBbO2unvlu10NS7FgR42ehJ+eQ2zbpV8/229x56o gtICCG/HZjDyPRzQZNNdyXRXSjags8fw0q76JU2EtlXToA02bBcYx74GhXXmkhNH6Vc/ J7Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kdC3swFy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y5-20020a63ce05000000b005038290f44csi2710692pgf.527.2023.03.14.11.46.12; Tue, 14 Mar 2023 11:46:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kdC3swFy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229970AbjCNSnK (ORCPT + 99 others); Tue, 14 Mar 2023 14:43:10 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760369926030280929?= X-GMAIL-MSGID: =?utf-8?q?1760369926030280929?= 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/staging/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 *dev, u8 ConfigType) u16 AGCTAB_ArrayLen, PHY_REGArrayLen = 0; struct r8192_priv *priv = rtllib_priv(dev); - AGCTAB_ArrayLen = AGCTAB_ArrayLength; + AGCTAB_ArrayLen = RTL8192E_AGCTAB_ARR_LEN; Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array; if (priv->rf_type == RF_1T2R) { PHY_REGArrayLen = PHY_REG_1T2RArrayLength; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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[] = { 0x318, 0x00000fff, 0x00000800, }; -u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE] = { +u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN] = { 0xc78, 0x7d000001, 0xc78, 0x7d010001, 0xc78, 0x7d020001, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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]; #endif From patchwork Tue Mar 14 18:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69785 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1924684wrd; Tue, 14 Mar 2023 11:46:26 -0700 (PDT) X-Google-Smtp-Source: AK7set9MzqfKPjithzGfbCcBEAKCjZH3IOxJSPE+XmNLcV3zoN+b2FVKSCntvOqsAHCFepbrOG0r X-Received: by 2002:a05:6a20:4282:b0:d5:d715:f800 with SMTP id o2-20020a056a20428200b000d5d715f800mr1351433pzj.27.1678819585772; Tue, 14 Mar 2023 11:46:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678819585; cv=none; d=google.com; s=arc-20160816; b=d+IWPE7h7Ki7zerhAIU/m8mJLla/ONV39jP63A1twpeeFbjqaR6gWxplntMr0NbiIv 8LLQh7dkcVSowZF2z5L1jLq+ZxEGBjhKG3MXI8E/GqBT6W0IK5jbvB1F6UIH6Nrc3pxI F0VHkEv6S/gv+s6McOoPq8V9Huxx6ZNgXq/7SFbPW4bOnH3J5UaGKAUAYk2388j8MCic 2g69AYzcGXesxtX3Tf/igQlfKuEu5/s1jS7T/LK1+A4V/de2uoWmjBFW75Sv49mDqVAQ a4b8GfLdbXxiuOegviZuedYHqyVMcYkwqYlifnCe6+nFy6Idd06iM0y6J3jtAXcc0lhq cmFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=TA9zaJ5cm57+RQC5jLFl72abHNghx3LQzCmXrcIYNDI=; b=GG/d5KxzeEj+U/qU8+WyvkJs34R5iaF06NAexK38WrdD0w/ZFefuZI4VlcVBWAIVr0 VfjFxuQRde0kD/cxGuON3RXSQt2mceRqW505WoQLFaciwR2SULseMWLdTQLRDD/cbwyk VczoXglun9hiELu2wprm9oryF74SLNLTUEkO/BI9Gjii3anoE2W8fBpmUQbv6ZrzxAnO 5cvd3nfCfz65+zhghqw/UU9kZHqs5yLIFmERli4pebUfs0EUs50+fbTojQqllDEYtVwM tC05+Fa8KEXDs2GkHz2GWj59ZlXIXQmosB1ESetdPzP0nya1NRJMKpog0RBL4Wv+w6/o 746g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LggMcBwA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e1-20020aa798c1000000b006256d92a5c5si1892563pfm.365.2023.03.14.11.46.12; Tue, 14 Mar 2023 11:46:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LggMcBwA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjCNSn0 (ORCPT + 99 others); Tue, 14 Mar 2023 14:43:26 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760369925961609891?= X-GMAIL-MSGID: =?utf-8?q?1760369925961609891?= 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/staging/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 = Rtl819XMACPHY_Array_PG; } else { - dwArrayLen = MACPHY_ArrayLength; + dwArrayLen = RTL8192E_MACPHY_ARR_LEN; pdwArray = Rtl819XMACPHY_Array; } for (i = 0; i < dwArrayLen; i += 3) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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_1T2RArrayLengthPciE]; 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 From patchwork Tue Mar 14 18:43:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69791 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1927831wrd; Tue, 14 Mar 2023 11:53:44 -0700 (PDT) X-Google-Smtp-Source: AK7set8lUZQWdXMGKupCfC1NiPdKt6gmfBjMQP4NzZA7yHdZYacDUcon/i+wX007a0y+qnSTK6E2 X-Received: by 2002:a17:90a:540d:b0:23d:382e:992d with SMTP id z13-20020a17090a540d00b0023d382e992dmr3072845pjh.7.1678820024376; Tue, 14 Mar 2023 11:53:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820024; cv=none; d=google.com; s=arc-20160816; b=NakT0m35dV6cKZyRxUuUBiheJL7LSzzyIiEkukI3S1s5toclUePAMUdN+WxNwyZxtj tmA6mLYzEMT1S8udCBy53Gg1QxtO//rbCgRBTo4FKrulPZsgWFZXrBAvswlN5tk4RK+x BkMy3rr5mAPNxMgkIV7bqb7wQhoRag++Jq2+t12jNTAEyIW0EQu0VD3ycffV3m4ggvk1 xxyyOCAP/FSpso2vhfUSoAU+7njTF0ZVGRrKFeTOQlWeNhmT5Bo/V8VWMzqq341ceT+7 2TvOlHA6I3EXMhZya6/OGlaY8vKM2DOeRlKpCavBqVKmaESqENHPvxBnTodt37tfIZ6N 7zcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=g8LjbSZR0Kfj/oBrMiuwr7Jdgg7szPbhvPzSbkmPBCg=; b=sZSg/nC+Q9tydqrnHq7zvD0q1/mVO1r0ixTdEDeX7ZJOevNISrTZeDISJ4ef2sv2GS inIu6dkqg1pTh1LjZbNgaJQIn8S/fYxUTx6cwGrs7xjhtTEOQf+uZX6sor75xza/5shS FEKam1nmh/oV3+OXa5RkrjJQyLRS9xlYxiXdCP/fXWy+rmvO/p5ZTrURQSzD7+zK2Vc3 EvmS7RlfapBjidTPSIZTz76ICedwf9gbQ/JFzbjBI6fmuT8kKtfb9QWy7eQO8y5rwgUC bcTu9bKf4zmxPYiPEiXK0xZKGX0mFXcVHd0xA8QRdB/rCW+pJMNDuP1LzJOyxKv0EJh5 quNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UyM49ecc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n35-20020a17090a5aa600b00233b2b867dcsi3002668pji.76.2023.03.14.11.53.31; Tue, 14 Mar 2023 11:53:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=UyM49ecc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230081AbjCNSng (ORCPT + 99 others); Tue, 14 Mar 2023 14:43:36 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370385961557193?= X-GMAIL-MSGID: =?utf-8?q?1760370385961557193?= 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/staging/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 rf90_radio_path eRFPath) switch (eRFPath) { case RF90_PATH_A: - for (i = 0; i < RadioA_ArrayLength; i += 2) { + for (i = 0; i < RTL8192E_RADIO_A_ARR_LEN; i += 2) { if (Rtl819XRadioA_Array[i] == 0xfe) { msleep(100); continue; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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_1T2RArrayLengthPciE] = { 0xe1c, 0x12121416, }; -u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] = { +u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] = { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x00000ee0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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 @@ #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 From patchwork Tue Mar 14 18:43:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69788 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1926243wrd; Tue, 14 Mar 2023 11:49:40 -0700 (PDT) X-Google-Smtp-Source: AK7set/YixNWqlBQ0fIcGiArFXdsbyiKZJB+J/x4F2Eb/JiCoyX+dhcv+i9IhR4jFXVOmkUolv72 X-Received: by 2002:a17:902:ecc7:b0:19c:f232:21ca with SMTP id a7-20020a170902ecc700b0019cf23221camr143066plh.3.1678819780169; Tue, 14 Mar 2023 11:49:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678819780; cv=none; d=google.com; s=arc-20160816; b=W8IuznJOf3kj0pl++CQd0qVFTsrGIobW7bVYTLmC15RbpcyXBzIlQhkKH7CGk7xiRR yegp6UUoQTHsL2p/Hwhma31NdxhmlWcAMADlirpBqA846aHWpC/U9otPIkgi/fIsINDt 0ZCW5K+4W+H2+U7ovLd9S4hcI7Jpe5mMIQm10PxpNSTs5eu2hyPfrRBZySPoK0DLL3fk JqF0pCGc8o7QXt9jtm1gP0YSVDWoTbu989TPOO5toZKscLk42+Bbbcah0p4FuCqus8dG 0YBRGojCJnsrv64dEtibNaHwMaMV58YD+8YlFhmxr646MpEKR8B3Fz+OSrkdXmXc9cMV gGTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=bBloYsUXJ4nsR8iknh3IyaxMJy5tm/ZnRPS+e2A2ehg=; b=TTPgxjNKTyS4FEcVpJjM0xHnW/7AStLryBMMNXASdiE+9aQ6BvAiryJRQihWa5n7QM ACG1hpOZbbpGYr+Mz9vyYpZ+sQmsd3F3YB05Y3iaWLFfg0z3eOttyt4lcN01uPZEI/+7 Pjob3YufRFbJhjH1gn8H/jDXmXbzWfGsKUc2eJLMOB3SARki8AbFbu4T2GsxEiFczLmo nMpc0HVYHhxWhVZCEr6UKzGsCaSnYe1dU2IbalJmym+bWkw8fIWe4K40OeI9gPMYdoA5 hVcwv5hxFLrl947FSmcGOPYioxi8Mf8ZyWLkWK2QMAlzXQQHNyyD+XSsQgwWhxJ3m+Cm 7/Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Cc+eiJJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kc14-20020a17090333ce00b0019af0ff58b3si2981693plb.388.2023.03.14.11.49.26; Tue, 14 Mar 2023 11:49:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Cc+eiJJb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229988AbjCNSnr (ORCPT + 99 others); Tue, 14 Mar 2023 14:43:47 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370129960321678?= X-GMAIL-MSGID: =?utf-8?q?1760370129960321678?= 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/staging/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 rf90_radio_path eRFPath) } break; case RF90_PATH_B: - for (i = 0; i < RadioB_ArrayLength; i += 2) { + for (i = 0; i < RTL8192E_RADIO_B_ARR_LEN; i += 2) { if (Rtl819XRadioB_Array[i] == 0xfe) { msleep(100); continue; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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] = { 0x007, 0x00000700, }; -u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = { +u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] = { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x000006e0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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 From patchwork Tue Mar 14 18:43:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1929014wrd; Tue, 14 Mar 2023 11:56:16 -0700 (PDT) X-Google-Smtp-Source: AK7set8yHoX56Uu4tSj6WyuVYtLOyAEiNu42K1Yjsyhl0A2Se/CA6vq+E1mrRiEzWeK2gluR03o9 X-Received: by 2002:a05:6a20:6909:b0:cc:ca9:4fde with SMTP id q9-20020a056a20690900b000cc0ca94fdemr24841722pzj.33.1678820176303; Tue, 14 Mar 2023 11:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820176; cv=none; d=google.com; s=arc-20160816; b=bYBmmEO+wcwgCcgsmK9Sg6gCR7FEMBu/1omn0CmwHfd3W4huvbNLebqZ66YAv9drka u7l/0UKG61hYEm8iU9QHzB7ByhH62ZOcACbUAp8nkBkIg0+JNuec28B7RtoPMExeUXB8 fVPoGDKagsZIZs2/lBiE995+l5prIonF3+djxsptPNFyG/DWlpRM19v5c2Quro1WRbQc sWHjBqVP2IpXxINI+Oj2csOwJf1d21xH8NFKhZwUh7BoAEqrc3+BleuhhVGhwD5d9iKG rUiG6vsph/NZB6ydcUOEZQsZ6HWuuWCtWniwKeKvWOSKcMsTbqvVLAUqSql0KYnqYt7h Llaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=1s6Yk/yWtlCX9fg4ML/GfDhv7pAqeBZ0tu9hAhPDEqY=; b=PgOuQOTq9bMSYFf3HTn29BFawmiO30BVlGrz98ZFqJ0pBy6SwMMEvVEsWiggUztLNp iip0xO28jwLesxLGPu/QQ0BSjsV6runYfgDiTytfp1i2j4rp7cikxvu1SFu4c+7CIwg+ aPMzV+ozqJ5bH0p/3EHGQh0LarVK0Zm7efOLbtIxGCOkIyWJnF3NfOnOcL0oDtAxBq4i LtMyJVehCd7XohgqDQia2kxTCs5TmVIhJbzqz+XT0YvRWyXZFVFDdoIx+d2lqnnZWbpO eChz1sWwo/YThv8wjnlhmvO9KnQjIa+DnAnwQoRDifch5zrCTbBeSLRVvtwjOrdBjRUG H0Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fxAhfQl4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r188-20020a632bc5000000b00502f48f1692si2722176pgr.826.2023.03.14.11.56.04; Tue, 14 Mar 2023 11:56:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=fxAhfQl4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230409AbjCNSn7 (ORCPT + 99 others); Tue, 14 Mar 2023 14:43:59 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370545114081906?= X-GMAIL-MSGID: =?utf-8?q?1760370545114081906?= 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/staging/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 = rtllib_priv(dev); if (priv->tx_pwr_data_read_from_eeprom) { - dwArrayLen = MACPHY_Array_PGLength; + dwArrayLen = RTL8192E_MACPHY_ARR_PG_LEN; pdwArray = Rtl819XMACPHY_Array_PG; } else { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE #define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE #define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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_LEN]; 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]; From patchwork Tue Mar 14 18:43:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1927396wrd; Tue, 14 Mar 2023 11:52:30 -0700 (PDT) X-Google-Smtp-Source: AK7set+y9jFnu5T+1MrcN9QwvqJQhVhm15ZDK04dDwq+llIZCu5RfnS5MYB+uuLz5v9uaS15sCos X-Received: by 2002:a17:902:e847:b0:19a:81c1:e743 with SMTP id t7-20020a170902e84700b0019a81c1e743mr147043plg.2.1678819950336; Tue, 14 Mar 2023 11:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678819950; cv=none; d=google.com; s=arc-20160816; b=n4nNU20DPsmKs1pNvTDloxCnvABto7C8sKpXwU4kYSVk78nriD5oe6qfaEIfSXLvGk wpemyxz/VqjgnWxsF1ZhGt2pUP7OcYFeavOwl5qk17CqiPS1QjD6Dw3R8g9ekuCbG45Q XIxX5dZyD+kDargAPOsJPmrDpu5lhsQbZfDKztUZZi+cX7OOYnMWD5FZBCsvUuh5vGD4 kp66qhfjwTQkgP8bM7tIn7NEPOmlI4uwOc1km/YK5TwlmjCECq1boqO6vW+yKbxzNuEp 6oUQOFWTFRMnKkO42UxPymAx99Bz6s8d79CutjUAiIQcyRV+TbzBMc9pN3oiMeD389QG ccJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=d0AW1dgnhE5Xlf5n9QYJOtZN1NTrjTisP+WLFv3uPMk=; b=kVqExCPFvfH3aRb/4EVrzAqAI2j73Ox0P/y5Et5s4bWnQXLKsMAN//FQuvYKZ5pU02 8HDhz11sxg+L3G4ghcrZ9PHkQp675WqEmzrV5xZLmGdIgFl0zjtxXcLl0llyc3iYKN6G n4ja7Ftwk6o04nH8PrPW4Rae3V/8LEoPnWpBUNLPqy7b/4JE5PD0hEHz7O2qgbLlgeLT UdCyLJvXQupeU3kDdtptJulrI2u1J8R4ss10G7uwIfizLifsX9mP1z7YioZOGKF3Vbpy gpyacuTIMpExNHTUNn6MPZu+rD1zZtztyDu5OSVvBM1mfkCyEJQImnmgTeVmIJ2S4om/ UO4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=C2j9764W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lf6-20020a170902fb4600b0019fb6fabcfesi3024050plb.88.2023.03.14.11.52.17; Tue, 14 Mar 2023 11:52:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=C2j9764W; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229813AbjCNSoJ (ORCPT + 99 others); Tue, 14 Mar 2023 14:44:09 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370308196280266?= X-GMAIL-MSGID: =?utf-8?q?1760370308196280266?= 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/staging/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 *dev, u8 ConfigType) AGCTAB_ArrayLen = RTL8192E_AGCTAB_ARR_LEN; Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array; if (priv->rf_type == RF_1T2R) { - PHY_REGArrayLen = PHY_REG_1T2RArrayLength; + PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARR_LEN; Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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" -u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = { +u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN] = { 0x800, 0x00000000, 0x804, 0x00000001, 0x808, 0x0000fc00, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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 @@ #include -#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 From patchwork Tue Mar 14 18:43:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1928818wrd; Tue, 14 Mar 2023 11:55:50 -0700 (PDT) X-Google-Smtp-Source: AK7set9KMlBXq0DE0JKF5n0HeNVTtxlxuD+Sdk35rCS6a21DQZD3yaElEDAMGw4fjVc7z1pR1ibS X-Received: by 2002:a62:6143:0:b0:5ab:be1b:c75e with SMTP id v64-20020a626143000000b005abbe1bc75emr32940793pfb.24.1678820150545; Tue, 14 Mar 2023 11:55:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820150; cv=none; d=google.com; s=arc-20160816; b=agPcFvx45NQG3nS5i1lQnMC4f360rQsdAA+JwLytInKP2I2NMvkk/jdt+J8J7zHBlK lU4qpqLmUopZxhtRppDUBV2A66R6FpGobzx24soqqiCFPidphjXSKu/tmgqgWhmgjr5O JZEnxnUxHXRQGgpwWzxr6VnCvWHfz9yoiiswJUzwdESyrAbRwTWSYMqfi2U+fabRZz2y uKFUhKtvLnGFdA4H6p8HAr8+ZfKaAYvV2mbIyUt0yncAOGZSM7AEfV5OphfxX4DHmCC0 89Fl17kHaPnqxw/cXdyiLzw9Ax4NBRmfHbmXhLks23+dE6gWGLoj0nBF27EiPdg6MM4z 2YAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=ze6PWDtpTyasNsC7Si9pFrohRL/yry2tJYYV5FMAIsk=; b=yZNJpZe27RCI8NjMUR2WXpy3RVZDawSjlKpnysAn22zWrASu+8bQKLxBOT8KzTnCH/ Gg5Rllb7ZzoJMLYg24SjxuKKFTAoR/UB1Pn2DTuIw0u1y2QY/Sxww0mdKjaIM2rua9Fx ztWBEWsAM5cmXlGBDDRNFk9wGKG+JQIXpi5fxAMTnisgOunreH2Uv+0LS4nj1tWNGwxl 6nwe3ZW5QsbKdmF1nqMitkjhLrHh9gwCqeRvFuZvlpMDLBolERtoLD9j5DJ/PeUc7xmN 9TlsXhLfJX1pcN01pJs0EFF7N4PCVFsTsO2zQmbvK+j4iv82UJylxYGvzy74QWadINXb qp/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AxozyntR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r188-20020a632bc5000000b00502f48f1692si2722176pgr.826.2023.03.14.11.55.38; Tue, 14 Mar 2023 11:55:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AxozyntR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230304AbjCNSoV (ORCPT + 99 others); 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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370518043424384?= X-GMAIL-MSGID: =?utf-8?q?1760370518043424384?= 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/staging/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) if (priv->tx_pwr_data_read_from_eeprom) { dwArrayLen = RTL8192E_MACPHY_ARR_PG_LEN; - pdwArray = Rtl819XMACPHY_Array_PG; + pdwArray = RTL8192E_MACPHY_ARR_PG; } else { dwArrayLen = RTL8192E_MACPHY_ARR_LEN; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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[] = { 0x318, 0x00000fff, 0x00000100, }; -u32 Rtl8192PciEMACPHY_Array_PG[] = { +u32 RTL8192E_MACPHY_ARR_PG[] = { 0x03c, 0xffff0000, 0x00000f0f, 0xe00, 0xffffffff, 0x06090909, 0xe04, 0xffffffff, 0x00030306, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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_LEN]; #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]; From patchwork Tue Mar 14 18:43:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69789 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1926684wrd; Tue, 14 Mar 2023 11:50:38 -0700 (PDT) X-Google-Smtp-Source: AK7set+nYrdz9NAP+EaAKNvpvFKkILpKSkbtIMJYZeGKHdtHjn3AX4x2L8mbEeMO34za4fg+3/W7 X-Received: by 2002:a17:90b:1d8b:b0:23d:35ae:5ab9 with SMTP id pf11-20020a17090b1d8b00b0023d35ae5ab9mr3313912pjb.9.1678819838704; Tue, 14 Mar 2023 11:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678819838; cv=none; d=google.com; s=arc-20160816; b=uA/qYukaXG10pLDkZ+UsPpEHZsmdE5b0Co278jIQDowXHVZhzZyN9XIkZxl1X/mO8e msjzKNzLHoVcZcHtC2eFz0vKi6V63VQl1gRxDVPr+6QWK7o3IrnAJNMD05er2cD1FvfH gHrqEo3zNb6Z+Hcx3ex9B3sGCmMAeoaUbNovm1k25wngRTuWdUoJN3o4ad8rBPBXtwQ5 tuYZE1RpegGQ2GtnHuQ0vZEMlX8Db1SRQQ3VhQZuuSRbl9MUckk6bDTe+OKguH2uMDaM ngwUEKRFZmmL/PkXceRDRxEDeqJOcpi9IyUBGuxxk5JBc0ukUULsNMSCey6FZXfC28mh BnOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=0y9mPuC4HKBUj5I294EC9CBSZXqeTk6Vm6POjoEahtQ=; b=gyGOfQ1wGm/hixtGin4GjPQdRUjDz9Sy0t2G3cT2QaoR6P+iMIQjtYxwzoDoWN92bM fxpTrS1y4R8OKPQJQn1jg6GTnmYzJ5he5UHf7lgb3NV158arDI5O6nyAyYNiy2KOTbRi 2qEw3gNxuWL0AZ8moFv1+02CnznEPhaR6FqlAsv838i9rXdGMKBB65BhU8MmViR37x+2 m4nS/ciZx7qNUE9gzX5AX6ixwtVMedtAbHCayKERYiER0LrCoYr9L2VmW8CH3k4tBm4X 88S7FayJucw+FyyK+3IKLHLTwLXgr1/+oKADWzl4tw830Ay326FBCUysXuqELKhnCY3K NYLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Q8dEcaCU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 205-20020a6304d6000000b0050754e93605si2740252pge.558.2023.03.14.11.50.22; Tue, 14 Mar 2023 11:50:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Q8dEcaCU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230250AbjCNSod (ORCPT + 99 others); Tue, 14 Mar 2023 14:44:33 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370191089083282?= X-GMAIL-MSGID: =?utf-8?q?1760370191089083282?= 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/staging/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) } else { dwArrayLen = RTL8192E_MACPHY_ARR_LEN; - pdwArray = Rtl819XMACPHY_Array; + pdwArray = RTL8192E_MACPHY_ARR; } for (i = 0; i < dwArrayLen; i += 3) { if (pdwArray[i] == 0x318) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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] = { 0x007, 0x00000700, }; -u32 Rtl8192PciEMACPHY_Array[] = { +u32 RTL8192E_MACPHY_ARR[] = { 0x03c, 0xffff0000, 0x00000f0f, 0x340, 0xffffffff, 0x161a1a1a, 0x344, 0xffffffff, 0x12121416, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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_LEN]; #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 From patchwork Tue Mar 14 18:43:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69797 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1931869wrd; Tue, 14 Mar 2023 12:02:29 -0700 (PDT) X-Google-Smtp-Source: AK7set809LQm3eKA0Pjg4jA7tx1g1jlinB9O1c1hoFu+1LRChidqQeSBogNjNlDj1+FlEwbw7vJH X-Received: by 2002:a17:902:d2c4:b0:19c:d316:309a with SMTP id n4-20020a170902d2c400b0019cd316309amr145515plc.4.1678820549209; Tue, 14 Mar 2023 12:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820549; cv=none; d=google.com; s=arc-20160816; b=tZzDlpaojM05jXku4MYt6gzNap8JVraVH1Y4TVxVoI/bpvSpfQhfCRjIfEOm9ugQUq p4SxxT6DmqLfQcG9fQMgzZq3/RWECGBq23VUj8eZRng034CoyykW0LlKYwuaGxgA9Bl4 JUtDpv9MXM/mRWiDirtlLToViq08CoAipfuXT+Ys426x6JyeMkv2TlmkwBwo2T8JYxAq zh71irtxihuosZTVxtW9zmkZQoxCby+9Ir5xTBpMgiL7rwqPKDAA+zK09dmvwmj7tfhx qrrfdzghSyBmKbG0//mcSTsL10TqyzWvQIDrnp6mq3R6dyAzFqaQtdVqCyxefwU2fnEw X+2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=JhOP8mQ5Z2Gmq+/y1PXXgLvgLODRnQ4GFaonYd0lOUw=; b=iRnjLW9oni6QPYQk1hXdCCsbuEDujsbEQTvf+x2XUT6Zi3vh7ylw+ATB0HURpJj9KT /Ub1F1Yzhho7mPR6Mm3vphaqBmn5xRJE7COmatf9W0kWdIMjBn6fAOPRjrTotcoT8FCi zZwlTa+OC4+WCggExrwS3gmDgettJrTZPZ+gVtywh8UsAYpRrKts+Mn1kOLEYEbr6zey 1rqMWAXLdCy2dSZFYkwT0GCBLHNabSilRrprwrLTcNTXzz/NpjrssI5Iin4wzgS0WGEV IY1PZdquBcm3O6q+QcvoMSpQJDpkqqxqqso/swTC+O5esmS6kX46aBxlf+IHIXplZVQX kkSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=P50FfZwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kd12-20020a17090313cc00b0019f185d6766si2871740plb.464.2023.03.14.12.02.12; Tue, 14 Mar 2023 12:02:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=P50FfZwe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229784AbjCNSoh (ORCPT + 99 others); Tue, 14 Mar 2023 14:44:37 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370936621435511?= X-GMAIL-MSGID: =?utf-8?q?1760370936621435511?= 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/staging/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 = 0; i < RTL8192E_RADIO_A_ARR_LEN; i += 2) { - if (Rtl819XRadioA_Array[i] == 0xfe) { + if (RTL8192E_RADIO_A_ARR[i] == 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]); } break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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] = { 0xe1c, 0x12121416, }; -u32 Rtl8192PciERadioA_Array[RTL8192E_RADIO_A_ARR_LEN] = { +u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN] = { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x00000ee0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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 From patchwork Tue Mar 14 18:44:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69793 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1928566wrd; Tue, 14 Mar 2023 11:55:15 -0700 (PDT) X-Google-Smtp-Source: AK7set8hywdUeL4Xtl29Lq+LbYfjyxotdpgAfV3NKn6L+9cieJOxfv9+QhWvVOBIWff0t2+rw18N X-Received: by 2002:a05:6a20:f09:b0:d3:c3e7:30a3 with SMTP id fl9-20020a056a200f0900b000d3c3e730a3mr9548599pzb.48.1678820114946; Tue, 14 Mar 2023 11:55:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820114; cv=none; d=google.com; s=arc-20160816; b=Ex6R0DLExqiF+np9DJHbaWug31pI93qYpCvA9jQRdbxajbPbmgwSFIzQbsquBVvaX3 KwPFhVSwgyN1KtDCcSwTOJ0Pem6Rbkbo3MTF59Kex2KS3YebLBgbUeJdlYHdpOS5sugV CLVepQGAw+egRabu4HZqw4iGTDK8QTIudY9IpHct8rDDQQXcXK1wlMSUUdNQ4lIIi7yv Ez1oN2z5C9oVBzc99AcTnQ0oKB8X9h9JyQO3+Z9VtvrSrzj3t0vPRJdm846ftag2bp2m uPIThLXazPkB4+nivjS1EwfyGiKBspNgUYzpRCTSIocbY7rcRjUEjwuQzsL/4BqCGMrt svZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=dX/61Oavue+o3+oO8HANeoCLyyVoQ/bbCU3a8t7lgHo=; b=GHK1c1g7jpRt3jwqRjPyw4UrkVuKJ2g24hxy6eHNU5APUuyMRhEnRgEtz9FRRRRbRG 05T632SHs4YVUAiRMfBw8jtS8ku/VWNLgOEu/w1Tfzc8G/nry6Il0IJOW7lIMtOF+hBc tFSs1x2TFg2fV7K6UcjdMozz99WjRr6hktpV1ah0VEvYOiVZAy4qJblpqhLyNa1CcpbL H4+03EViYS9U8exmyb5G4Fsu9APAfEB/GpYYLi8v/yW6ID1YRhZuuAced4t+ygNS/61H agVSEcgrw9cxfpkj79syZJNOgs2oIKTWzyQG0q8dT8WP5Gaq1Awei1hALJN6wu+RfoUR L0gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AqeMvcLO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d9-20020a654249000000b0050726756ee2si2810265pgq.96.2023.03.14.11.54.59; Tue, 14 Mar 2023 11:55:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=AqeMvcLO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230307AbjCNSol (ORCPT + 99 others); Tue, 14 Mar 2023 14:44:41 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370480774536697?= X-GMAIL-MSGID: =?utf-8?q?1760370480774536697?= 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/staging/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 = 0; i < RTL8192E_RADIO_B_ARR_LEN; i += 2) { - if (Rtl819XRadioB_Array[i] == 0xfe) { + if (RTL8192E_RADIO_B_ARR[i] == 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]); } break; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#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/rtl8192e/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] = { 0x007, 0x00000700, }; -u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] = { +u32 RTL8192E_RADIO_B_ARR[RTL8192E_RADIO_B_ARR_LEN] = { 0x019, 0x00000003, 0x000, 0x000000bf, 0x001, 0x000006e0, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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 From patchwork Tue Mar 14 18:44:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69792 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1928049wrd; Tue, 14 Mar 2023 11:54:18 -0700 (PDT) X-Google-Smtp-Source: AK7set9WElOtnvUmOUZRtepI5XDSfZLwzstXScgPwecdV1kM0kpgrPtAKw14a8XVppYeu0mhuyUF X-Received: by 2002:a62:2984:0:b0:623:231a:bc51 with SMTP id p126-20020a622984000000b00623231abc51mr8048636pfp.9.1678820057872; Tue, 14 Mar 2023 11:54:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678820057; cv=none; d=google.com; s=arc-20160816; b=QD04Fusf4waoVNNVX9HgzZYLtyN8OvKQlMGRHYenm9ufSPduTuNNDN6RIxJWma8LAY RSqdhGuoTlrvs9APjabh17MoJT1CkrTXkX4J44EAl32+2WBhioQD9Yjxnq3iIkp6uEAU ATwosumXgSpeT9CNTs1JUlJEizgKWryxwsLMu91Now4qNcJBIzeuk0HEHVx2fFPLwgPz 81ssHE2nHl/0yoatGXCPtCZLOb5WovCNtDXtgfGcaK4kSXMcYHem+BY7F5R14SG7eNpt Fv0jdOhVAW3IBGG8EprLDaASy5wnFvQhyOyr9m319X2hgBcUh1RGRnFZIpLhSGdkHUJG AzXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=1uYehhFxzaCa8Hl58SvBTbiOvy8bevbMRIqLTRcQvkQ=; b=PZZOwiC66av4oE6/HqSOF/vKB3Rdb4Bsl0wl4kLbzYzrHMR7DBNuCJ3p/bAG7lfuJe AnHb840bDq3PcUhBtmD5vh7xWfvzESEtVhpjTQMefHGr3l41ABzcR0E7cG3SX3trkaC9 Pi2D4p7kzVO1mTJWrYRqlQRwkx+nXiZFH21ZLBCGNk2BAaYd36fINVYowP4Qjxywvk9W dA48cBNeieomLAEixn40OnT3nLzvBoEMZa98mdx8AGJNW8YByU5JrlS+Cm2cXfZGP6GY ZE3RS3zSGRClFHQHb/Nwn9fQ9xr6BzLM/A0K+jLoYKwBPTgqfn3LM1b1JZ2rUk/norWA gNoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="N/LmTvq7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y129-20020a626487000000b006236c3fed1esi2576991pfb.304.2023.03.14.11.54.03; Tue, 14 Mar 2023 11:54:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b="N/LmTvq7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229926AbjCNSov (ORCPT + 99 others); Tue, 14 Mar 2023 14:44:51 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760370421082406960?= X-GMAIL-MSGID: =?utf-8?q?1760370421082406960?= 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/staging/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 *dev, u8 ConfigType) struct r8192_priv *priv = rtllib_priv(dev); AGCTAB_ArrayLen = RTL8192E_AGCTAB_ARR_LEN; - Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array; + Rtl819XAGCTAB_Array_Table = RTL8192E_AGCTAB_ARR; if (priv->rf_type == RF_1T2R) { PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARR_LEN; Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray; diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array #define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray extern u32 rtl819XAGCTAB_Array[]; diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/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[] = { 0x318, 0x00000fff, 0x00000800, }; -u32 Rtl8192PciEAGCTAB_Array[RTL8192E_AGCTAB_ARR_LEN] = { +u32 RTL8192E_AGCTAB_ARR[RTL8192E_AGCTAB_ARR_LEN] = { 0xc78, 0x7d000001, 0xc78, 0x7d010001, 0xc78, 0x7d020001, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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]; #endif From patchwork Tue Mar 14 18:44:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 69810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1940875wrd; Tue, 14 Mar 2023 12:21:30 -0700 (PDT) X-Google-Smtp-Source: AK7set+ByYYzYCy+rAgCTmVAgJAvtgeSq7vI3nBbBjrzRCWfzzHigc/2AZAJ8Nzi5VsajhCsgOYZ X-Received: by 2002:a17:902:e541:b0:19a:70f9:affb with SMTP id n1-20020a170902e54100b0019a70f9affbmr249319plf.2.1678821690208; Tue, 14 Mar 2023 12:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678821690; cv=none; d=google.com; s=arc-20160816; b=d8HVzedmhIhPqizraCOlH3en2k31tFoT0e0Vqqg6wGRnZkfsX2VyRJGcY4Pm8Yj72g AdaKRQx3FfREF3KWeRJTWL0/v5lwcz/rnTOTtUzGeRf4HUtKAo4zp4dRZJyQyU5eQTR0 ZQGm9NwljUF8d01+aNTC6RhkQoCCx0awH/jnezcodoNnUiHXo/dzvi8NQxmJ1NRnGRJM PLqLHvcrs0S3IS54qMUs2jQP63SrgCONwONb5yoeVp4agEJgFTkITdLNDhcueaLoCder QcDWtYVwZ7lEzFI0O4m/VIkaVU+MBdzzVyvxzP7MDstyu+pBSrtczg1Cej3CA6ovarcZ yyKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=bLOK37kaCCRFSQ6Qfe95p7DC41DH+xkXW4p/2GEywPo=; b=avAe3s8KtWW9v9jeQSzfdXUcvX+LtJsMMinUd31cOo3Cf5hhJhiKsqezkIqNpPJpq5 IlrsU9XInQ3EkPbHfGC2Bt3qbOSMRMK7eNygO9ShpWJNaKvSq/icw56uVGnW+RiTQY+r rtby9bJpPMgsLqfs0Vkp28Sz3+wIVUruJhHY6RdNh2rQt070CcoJ3Cicub5c0OCqL1G0 PUacSPxY80iJviLkG21/pe879D6KdxurKCj7q0ohO5BC0hP0HR/eFVeSpQuXZYAbmw/T rTUyL4XtsOYyRUPuZBNo+c5wobX43FoCTNO8DawcUAqNXKbxDPA/JdJgzNt9896h6krE BRhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=o5rcG3Re; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kb7-20020a170903338700b001994712728csi2912250plb.607.2023.03.14.12.21.15; Tue, 14 Mar 2023 12:21:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=o5rcG3Re; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230326AbjCNSpI (ORCPT + 99 others); Tue, 14 Mar 2023 14:45:08 -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-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: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760372132494980114?= X-GMAIL-MSGID: =?utf-8?q?1760372132494980114?= 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/staging/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 *dev, u8 ConfigType) Rtl819XAGCTAB_Array_Table = RTL8192E_AGCTAB_ARR; if (priv->rf_type == RF_1T2R) { PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARR_LEN; - Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray; + Rtl819XPHY_REGArray_Table = RTL8192E_PHY_REG_1T2R_ARR; } if (ConfigType == BB_CONFIG_PHY_REG) { diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/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 @@ #define MAX_DOZE_WAITING_TIMES_9x 64 -#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray - extern u32 rtl819XAGCTAB_Array[]; enum hw90_block { diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/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" -u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN] = { +u32 RTL8192E_PHY_REG_1T2R_ARR[RTL8192E_PHY_REG_1T2R_ARR_LEN] = { 0x800, 0x00000000, 0x804, 0x00000001, 0x808, 0x0000fc00, diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/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 #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