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