Commit 55b3ebfe authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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()
parents df5dd337 c93637e6

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

+5 −1
Original line number Diff line number Diff line
@@ -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);

	}