Commit 6b65fbf0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/mediatek' 

- Drop redundant error message from mtk_pcie_subsys_powerup() (Zhen Lei)

* remotes/lorenzo/pci/mediatek:
  PCI: mediatek: Remove redundant error printing in mtk_pcie_subsys_powerup()
parents 19a41f99 28bba1e2

drivers/pci/controller/pcie-mediatek.c

+1 −3
Original line number Diff line number Diff line
@@ -991,11 +991,9 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie) 
	regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "subsys");

	if (regs) {

		pcie->base = devm_ioremap_resource(dev, regs);

		if (IS_ERR(pcie->base)) {

			dev_err(dev, "failed to map shared register\n");

		if (IS_ERR(pcie->base))

			return PTR_ERR(pcie->base);

	}

	}



	pcie->free_ck = devm_clk_get(dev, "free_ck");

	if (IS_ERR(pcie->free_ck)) {