From patchwork Fri Nov 24 08:47:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 169306 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1010736vqx; Fri, 24 Nov 2023 00:50:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGGejNetNouPbqE576rm0L6qcxeXqdgOzW9GuwOz78MzH7ehFUZPvdoS5CNsAJN9PsrfG1w X-Received: by 2002:a05:6a21:999c:b0:18c:651:67fe with SMTP id ve28-20020a056a21999c00b0018c065167femr481421pzb.62.1700815829664; Fri, 24 Nov 2023 00:50:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700815829; cv=none; d=google.com; s=arc-20160816; b=LkdTgYwsDNyMLXIXIYqBcT1Jvp6voiL56pr4DgrogwIBhD1p7OQ7kBjIl8VLfUSq9f OuBIhcWbPXOwHo1xpOqa0I0Hsf0na1qGY0eR5FONnahbxX218bKC3jqn9I2sOOnopT4p rOAHBNjASxsdzQdiCPkxx+byMoDNhnUgCKCrDxU7ynkYy0RpB9jfMc8wQdnjA7PCdV40 6djTeBac5WAW3JCH5DO0MU+naqtSPmP2bPuN4eHGRQwRcsg5JFJQpJD9nTs8nNY5Kp9j IS7yDcbdWhSS7NyVu3fw5XM6cSTImXlVg3JFSi/OiMTXB248Zyqhaj/gNcGDEBvdLhUI WDNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=I2eJ0uUjJ3bAZU37elczYbV2SPwxGwfjKlKuc6muVh8=; fh=W+eSkce8uvUdQ8A1Dj5F8klEXQy967eJmFo02igvYfU=; b=uCKPh8+djejnWEMP8oeztP1Elx2H4qwB80ll5uWGCwzPAoNzqx+ICYAm6sazew9XYt ORRgrVmLhPwxxZmLLDbvGOJD00iCErCgZe4lvSmL/cDZT644D6h+0YLfyjeeNhm9TKMv 0Y92YYFaIgNJAXM6XNBZrNpJ1UbRqCWliUDmrcM1ODFMQYd+DaLtSnCqbirj2ugOc4cP V+/lN1S2if2fHkpEaTTeoLhe1MVeNz5bVmzA/Lk7Y11E+jy57x6EdVl8qjCOekriT1nb 2dnaLSLBpeFBIvyrZuu3m7BkAilksrz5KvKDenCVxTzdpEbWvoWfW/wW+Ke/DJqKYaR3 I7Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SL5iB9l8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id k17-20020a170902c41100b001c3a05b0b58si3039751plk.500.2023.11.24.00.50.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 00:50:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SL5iB9l8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 21BDF801EE1D; Fri, 24 Nov 2023 00:49:05 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235262AbjKXIsx (ORCPT + 99 others); Fri, 24 Nov 2023 03:48:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235283AbjKXIs3 (ORCPT ); Fri, 24 Nov 2023 03:48:29 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13FE21BD; Fri, 24 Nov 2023 00:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700815716; x=1732351716; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OhgbBzthM/WTBTOWAYA/GP6MTbrtMnKaOGmStuDv10k=; b=SL5iB9l8TWry/wB6T1WaO2ziRQ2EArsA9JZKEdCUXhyGnzISFGVxfpqF toa2U4iqFlK4TQZ8u/SUDkYgc1B6J2SVrPbNv1seL6wvPJz0q40PAGVm8 LzCT+uL4a4+gaw4yK0ExUjDxVE38OTgd+9fQmBwURkGXixg0hN3iqVm51 hdzy0QbBZg3Qwo/v4otn/MU96b2pZkk96jgCRmgS79g0GBWRSxgkBqOjA EQK/iXohqgVnTep7QB5URnzJCiA18Qg9rsfrARHJK8qPEzcDJI51lePwG AivoaTy6AqL2BaGcTSWEVcTDND+Z0bmzAToxcHlENnDGPAHIIGMJC0Z1V w==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="456728897" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="456728897" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 00:48:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="760900448" X-IronPort-AV: E=Sophos;i="6.04,223,1695711600"; d="scan'208";a="760900448" Received: from mvlasov-mobl1.ger.corp.intel.com (HELO localhost) ([10.251.220.89]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2023 00:48:31 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: "John W. Linville" , Kalle Valo , Larry Finger , linux-wireless@vger.kernel.org, Ping-Ke Shih , Bjorn Helgaas , linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH v2 07/10] wifi: rtlwifi: rtl8821ae: Add pdev into _rtl8821ae_clear_pci_pme_status() Date: Fri, 24 Nov 2023 10:47:22 +0200 Message-Id: <20231124084725.12738-8-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231124084725.12738-1-ilpo.jarvinen@linux.intel.com> References: <20231124084725.12738-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 24 Nov 2023 00:49:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783434659282829480 X-GMAIL-MSGID: 1783434659282829480 Add local variable pdev to shorten rtlpci->pdev. Signed-off-by: Ilpo Järvinen --- drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c index 7877509c34c7..7cc648d49f2d 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c @@ -2270,10 +2270,11 @@ static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw) { struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw)); + struct pci_dev *pdev = rtlpci->pdev; u8 pmcs_reg; u8 pm_cap; - pm_cap = pci_find_capability(rtlpci->pdev, PCI_CAP_ID_PM); + pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); if (!pm_cap) { rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING, "Cannot find PME Capability\n"); @@ -2283,13 +2284,13 @@ static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw) /* Get the PM CSR (Control/Status Register), * The PME_Status is located at PM Capatibility offset 5, bit 7 */ - pci_read_config_byte(rtlpci->pdev, pm_cap + 5, &pmcs_reg); + pci_read_config_byte(pdev, pm_cap + 5, &pmcs_reg); if (pmcs_reg & BIT(7)) { /* Clear PME_Status with write */ - pci_write_config_byte(rtlpci->pdev, pm_cap + 5, pmcs_reg); + pci_write_config_byte(pdev, pm_cap + 5, pmcs_reg); /* Read it back to check */ - pci_read_config_byte(rtlpci->pdev, pm_cap + 5, &pmcs_reg); + pci_read_config_byte(pdev, pm_cap + 5, &pmcs_reg); rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG, "Clear PME status 0x%2x to 0x%2x\n", pm_cap + 5, pmcs_reg);