From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: "John W. Linville" <linville@tuxdriver.com>,
Kalle Valo <kvalo@kernel.org>,
Larry Finger <Larry.Finger@lwfinger.net>,
linux-wireless@vger.kernel.org, Ping-Ke Shih <pkshih@realtek.com>,
Bjorn Helgaas <bhelgaas@google.com>,
linux-kernel@vger.kernel.org
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH 4/7] rtlwifi: rtl8821ae: Reverse PM capability exists check
Date: Fri, 17 Nov 2023 11:44:22 +0200 [thread overview]
Message-ID: <20231117094425.80477-5-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20231117094425.80477-1-ilpo.jarvinen@linux.intel.com>
Check if PM capability does not exists and return early which follows
the usual error handling pattern.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
.../wireless/realtek/rtlwifi/rtl8821ae/hw.c | 45 ++++++++++---------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
index 6ae37d61a2a2..53cfeed0b030 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
@@ -2305,30 +2305,31 @@ static void _rtl8821ae_clear_pci_pme_status(struct ieee80211_hw *hw)
}
} while (cnt++ < 200);
- if (cap_id == 0x01) {
- /* 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, cap_pointer + 5, &pmcs_reg);
-
- if (pmcs_reg & BIT(7)) {
- /* Clear PME_Status with write */
- pci_write_config_byte(rtlpci->pdev, cap_pointer + 5,
- pmcs_reg);
- /* Read it back to check */
- pci_read_config_byte(rtlpci->pdev, cap_pointer + 5,
- &pmcs_reg);
- rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
- "Clear PME status 0x%2x to 0x%2x\n",
- cap_pointer + 5, pmcs_reg);
- } else {
- rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
- "PME status(0x%2x) = 0x%2x\n",
- cap_pointer + 5, pmcs_reg);
- }
- } else {
+ if (cap_id != 0x01) {
rtl_dbg(rtlpriv, COMP_INIT, DBG_WARNING,
"Cannot find PME Capability\n");
+ return;
+ }
+
+ /* 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, cap_pointer + 5, &pmcs_reg);
+
+ if (pmcs_reg & BIT(7)) {
+ /* Clear PME_Status with write */
+ pci_write_config_byte(rtlpci->pdev, cap_pointer + 5,
+ pmcs_reg);
+ /* Read it back to check */
+ pci_read_config_byte(rtlpci->pdev, cap_pointer + 5,
+ &pmcs_reg);
+ rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
+ "Clear PME status 0x%2x to 0x%2x\n",
+ cap_pointer + 5, pmcs_reg);
+ } else {
+ rtl_dbg(rtlpriv, COMP_INIT, DBG_DMESG,
+ "PME status(0x%2x) = 0x%2x\n",
+ cap_pointer + 5, pmcs_reg);
}
}
--
2.30.2
next prev parent reply other threads:[~2023-11-17 9:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-17 9:44 [PATCH 0/7] rtlwifi: PCIe capability access fix + improvements Ilpo Järvinen
2023-11-17 9:44 ` [PATCH 1/7] wifi: rtlwifi: Convert LNKCTL change to PCIe cap RMW accessors Ilpo Järvinen
2023-11-17 22:24 ` Bjorn Helgaas
2023-11-20 9:25 ` Ilpo Järvinen
2023-11-22 14:54 ` Kalle Valo
2023-11-17 9:44 ` [PATCH 2/7] wifi: rtlwifi: Convert to use PCIe capability accessors Ilpo Järvinen
2023-11-17 22:37 ` Bjorn Helgaas
2023-11-20 8:54 ` Ilpo Järvinen
2023-11-17 9:44 ` [PATCH 3/7] rtlwifi: rtl8821ae: Remove unnecessary PME_Status bit set Ilpo Järvinen
2023-11-17 9:44 ` Ilpo Järvinen [this message]
2023-11-17 22:44 ` [PATCH 4/7] rtlwifi: rtl8821ae: Reverse PM capability exists check Bjorn Helgaas
2023-11-20 9:59 ` Ilpo Järvinen
2023-11-17 9:44 ` [PATCH 5/7] rtlwifi: rtl8821ae: Use pci_find_capability() Ilpo Järvinen
2023-11-17 22:46 ` Bjorn Helgaas
2023-11-17 9:44 ` [PATCH 6/7] rtlwifi: rtl8821ae: Add pdev into _rtl8821ae_clear_pci_pme_status() Ilpo Järvinen
2023-11-17 9:44 ` [PATCH 7/7] rtlwifi: rtl8821ae: Access full PMCS reg and use pci_regs.h Ilpo Järvinen
2023-11-17 22:48 ` Bjorn Helgaas
2023-11-20 10:06 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231117094425.80477-5-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=Larry.Finger@lwfinger.net \
--cc=bhelgaas@google.com \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=pkshih@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®