Skip to content

Commit

Permalink
Merge branch 'remotes/lorenzo/pci/mediatek'
Browse files Browse the repository at this point in the history
- 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()
  • Loading branch information
bjorn-helgaas committed Jul 6, 2021
2 parents 19a41f9 + 28bba1e commit 6b65fbf
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/pci/controller/pcie-mediatek.c
Original file line number Diff line number Diff line change
Expand Up @@ -991,10 +991,8 @@ 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");
Expand Down

0 comments on commit 6b65fbf

Please sign in to comment.