diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2024-07-19 18:10:31 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-07-19 18:10:31 +0300 |
| commit | 55b3ebfedc199c1492c30d0ef0ad5dd7d4ee611c (patch) | |
| tree | 87c7c096795defcdd0f24027859e600f1afb820b | |
| parent | df5dd337283ad104ef329124d683b63d6b4dcd48 (diff) | |
| parent | c93637e6a4c4e1d0e85ef7efac78d066bbb24d96 (diff) | |
| download | linux-55b3ebfedc199c1492c30d0ef0ad5dd7d4ee611c.tar.xz | |
Merge branch 'pci/controller/rcar'
- Demote WARN() to dev_warn_ratelimited() in rcar_pcie_wakeup() to avoid
excessive warnings when the driver is confused about link state when
resuming (Marek Vasut)
* pci/controller/rcar:
PCI: rcar: Demote WARN() to dev_warn_ratelimited() in rcar_pcie_wakeup()
| -rw-r--r-- | drivers/pci/controller/pcie-rcar-host.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-rcar-host.c b/drivers/pci/controller/pcie-rcar-host.c index 996077ab7cfd..c01efc6ea64f 100644 --- a/drivers/pci/controller/pcie-rcar-host.c +++ b/drivers/pci/controller/pcie-rcar-host.c @@ -78,7 +78,11 @@ static int rcar_pcie_wakeup(struct device *pcie_dev, void __iomem *pcie_base) writel(L1IATN, pcie_base + PMCTLR); ret = readl_poll_timeout_atomic(pcie_base + PMSR, val, val & L1FAEG, 10, 1000); - WARN(ret, "Timeout waiting for L1 link state, ret=%d\n", ret); + if (ret) { + dev_warn_ratelimited(pcie_dev, + "Timeout waiting for L1 link state, ret=%d\n", + ret); + } writel(L1FAEG | PMEL1RX, pcie_base + PMSR); } |