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

Merge branch 'pci/irq-error' 

- Remove redundant logging for platform_get_irq() errors (Krzysztof
  Wilczyński)

* pci/irq-error:
  PCI: Remove dev_err() when handing an error from platform_get_irq()
parents 65c2bc6c caecb05c

drivers/pci/controller/dwc/pci-dra7xx.c

+2 −6
Original line number Diff line number Diff line
@@ -627,10 +627,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
	struct device *dev = pci->dev;



	pp->irq = platform_get_irq(pdev, 1);

	if (pp->irq < 0) {

		dev_err(dev, "missing IRQ resource\n");

	if (pp->irq < 0)

		return pp->irq;

	}



	ret = dra7xx_pcie_init_irq_domain(pp);

	if (ret < 0)
@@ -868,10 +866,8 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
	pci->ops = &dw_pcie_ops;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "missing IRQ resource: %d\n", irq);

	if (irq < 0)

		return irq;

	}



	base = devm_platform_ioremap_resource_byname(pdev, "ti_conf");

	if (IS_ERR(base))

drivers/pci/controller/dwc/pci-exynos.c

+3 −6
Original line number Diff line number Diff line
@@ -400,10 +400,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, 
	int ret;



	pp->irq = platform_get_irq(pdev, 1);

	if (pp->irq < 0) {

		dev_err(dev, "failed to get irq\n");

	if (pp->irq < 0)

		return pp->irq;

	}



	ret = devm_request_irq(dev, pp->irq, exynos_pcie_irq_handler,

				IRQF_SHARED, "exynos-pcie", ep);

	if (ret) {
@@ -413,11 +412,9 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *ep, 


	if (IS_ENABLED(CONFIG_PCI_MSI)) {

		pp->msi_irq = platform_get_irq(pdev, 0);

		if (pp->msi_irq < 0) {

			dev_err(dev, "failed to get msi irq\n");

		if (pp->msi_irq < 0)

			return pp->msi_irq;

	}

	}



	pp->ops = &exynos_pcie_host_ops;

drivers/pci/controller/dwc/pci-imx6.c

+1 −3
Original line number Diff line number Diff line
@@ -868,11 +868,9 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, 


	if (IS_ENABLED(CONFIG_PCI_MSI)) {

		pp->msi_irq = platform_get_irq_byname(pdev, "msi");

		if (pp->msi_irq < 0) {

			dev_err(dev, "failed to get MSI irq\n");

		if (pp->msi_irq < 0)

			return pp->msi_irq;

	}

	}



	pp->ops = &imx6_pcie_host_ops;

drivers/pci/controller/dwc/pci-keystone.c

+1 −3
Original line number Diff line number Diff line
@@ -1250,10 +1250,8 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	pci->version = version;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "missing IRQ resource: %d\n", irq);

	if (irq < 0)

		return irq;

	}



	ret = request_irq(irq, ks_pcie_err_irq_handler, IRQF_SHARED,

			  "ks-pcie-error-irq", ks_pcie);

drivers/pci/controller/dwc/pci-meson.c

+1 −3
Original line number Diff line number Diff line
@@ -488,11 +488,9 @@ static int meson_add_pcie_port(struct meson_pcie *mp, 


	if (IS_ENABLED(CONFIG_PCI_MSI)) {

		pp->msi_irq = platform_get_irq(pdev, 0);

		if (pp->msi_irq < 0) {

			dev_err(dev, "failed to get MSI IRQ\n");

		if (pp->msi_irq < 0)

			return pp->msi_irq;

	}

	}



	pp->ops = &meson_pcie_host_ops;

	pci->dbi_base = mp->mem_res.elbi_base;