Commit da30e8bc authored by Dejin Zheng's avatar Dejin Zheng Committed by Lorenzo Pieralisi
Browse files

PCI: controller: Remove duplicate error message 

devm_pci_remap_cfg_resource() will print an error message by itself when
goes wrong, so remove the duplicate error message.

Link: https://lore.kernel.org/r/20200526150954.4729-1-zhengdejin5@gmail.com


Signed-off-by: default avatarDejin Zheng <zhengdejin5@gmail.com>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
parent 3cf0eead

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

+1 −3
Original line number Diff line number Diff line
@@ -225,10 +225,8 @@ int cdns_pcie_host_setup(struct cdns_pcie_rc *rc) 


	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg");

	rc->cfg_base = devm_pci_remap_cfg_resource(dev, res);

	if (IS_ERR(rc->cfg_base)) {

		dev_err(dev, "missing \"cfg\"\n");

	if (IS_ERR(rc->cfg_base))

		return PTR_ERR(rc->cfg_base);

	}

	rc->cfg_res = res;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mem");

drivers/pci/controller/dwc/pcie-al.c

+3 −10
Original line number Diff line number Diff line
@@ -67,13 +67,8 @@ static int al_pcie_init(struct pci_config_window *cfg) 
	dev_dbg(dev, "Root port dbi res: %pR\n", res);



	al_pcie->dbi_base = devm_pci_remap_cfg_resource(dev, res);

	if (IS_ERR(al_pcie->dbi_base)) {

		long err = PTR_ERR(al_pcie->dbi_base);



		dev_err(dev, "couldn't remap dbi base %pR (err:%ld)\n",

			res, err);

		return err;

	}

	if (IS_ERR(al_pcie->dbi_base))

		return PTR_ERR(al_pcie->dbi_base);



	cfg->priv = al_pcie;
@@ -408,10 +403,8 @@ static int al_pcie_probe(struct platform_device *pdev) 


	dbi_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");

	pci->dbi_base = devm_pci_remap_cfg_resource(dev, dbi_res);

	if (IS_ERR(pci->dbi_base)) {

		dev_err(dev, "couldn't remap dbi base %pR\n", dbi_res);

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);

	}



	ecam_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");

	if (!ecam_res) {

drivers/pci/controller/dwc/pcie-armada8k.c

+0 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ static int armada8k_pcie_probe(struct platform_device *pdev) 
	base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");

	pci->dbi_base = devm_pci_remap_cfg_resource(dev, base);

	if (IS_ERR(pci->dbi_base)) {

		dev_err(dev, "couldn't remap regs base %p\n", base);

		ret = PTR_ERR(pci->dbi_base);

		goto fail_clkreg;

	}

drivers/pci/controller/dwc/pcie-spear13xx.c

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ static int spear13xx_pcie_probe(struct platform_device *pdev) 
	dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");

	pci->dbi_base = devm_pci_remap_cfg_resource(dev, dbi_base);

	if (IS_ERR(pci->dbi_base)) {

		dev_err(dev, "couldn't remap dbi base %p\n", dbi_base);

		ret = PTR_ERR(pci->dbi_base);

		goto fail_clk;

	}