Commit 9fb7454b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-hisi' into next 

* pci/host-hisi:
  PCI: hisi: Remove redundant error message from hisi_pcie_probe()
parents a739d56d ad719956

drivers/pci/host/pcie-hisi.c

+1 −3
Original line number Diff line number Diff line
@@ -284,10 +284,8 @@ static int hisi_pcie_probe(struct platform_device *pdev) 


	reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");

	pp->dbi_base = devm_ioremap_resource(dev, reg);

	if (IS_ERR(pp->dbi_base)) {

		dev_err(dev, "cannot get rc_dbi base\n");

	if (IS_ERR(pp->dbi_base))

		return PTR_ERR(pp->dbi_base);

	}



	ret = hisi_add_pcie_port(hisi_pcie, pdev);

	if (ret)