Skip to content

Commit 55b3ebf

Browse files
committed
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()
2 parents df5dd33 + c93637e commit 55b3ebf

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

drivers/pci/controller/pcie-rcar-host.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,11 @@ static int rcar_pcie_wakeup(struct device *pcie_dev, void __iomem *pcie_base)
7878
writel(L1IATN, pcie_base + PMCTLR);
7979
ret = readl_poll_timeout_atomic(pcie_base + PMSR, val,
8080
val & L1FAEG, 10, 1000);
81-
WARN(ret, "Timeout waiting for L1 link state, ret=%d\n", ret);
81+
if (ret) {
82+
dev_warn_ratelimited(pcie_dev,
83+
"Timeout waiting for L1 link state, ret=%d\n",
84+
ret);
85+
}
8286
writel(L1FAEG | PMEL1RX, pcie_base + PMSR);
8387
}
8488

0 commit comments

Comments
 (0)