Commit 0584bff0 authored by Aman Sharma's avatar Aman Sharma Committed by Bjorn Helgaas
Browse files

PCI: Check for platform_get_irq() failure consistently

The platform_get_irq*() interfaces return either a negative error number or
a valid IRQ.  0 is not a valid return value, so check for "< 0" to detect
failure as recommended by the function documentation.

On failure, return the error number from platform_get_irq*() instead of
making up a new one.

Link: https://lore.kernel.org/r/cover.1583952275.git.amanharitsh123@gmail.com


[bhelgaas: commit log, squash into one patch]
Signed-off-by: default avatarAman Sharma <amanharitsh123@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Richard Zhu <hongxing.zhu@nxp.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Karthikeyan Mitran <m.karthikeyan@mobiveil.co.in>
Cc: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Ryder Lee <ryder.lee@mediatek.com>
Cc: Marc Gonzalez <marc.w.gonzalez@free.fr>
parent a85a6c86
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -868,9 +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) {
		if (pp->msi_irq < 0) {
			dev_err(dev, "failed to get MSI irq\n");
			return -ENODEV;
			return pp->msi_irq;
		}
	}

+2 −2
Original line number Diff line number Diff line
@@ -2190,9 +2190,9 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev)
	}

	pp->irq = platform_get_irq_byname(pdev, "intr");
	if (!pp->irq) {
	if (pp->irq < 0) {
		dev_err(dev, "Failed to get \"intr\" interrupt\n");
		return -ENODEV;
		return pp->irq;
	}

	pcie->bpmp = tegra_bpmp_get(dev);
+2 −2
Original line number Diff line number Diff line
@@ -522,9 +522,9 @@ static int mobiveil_pcie_integrated_interrupt_init(struct mobiveil_pcie *pcie)
	mobiveil_pcie_enable_msi(pcie);

	rp->irq = platform_get_irq(pdev, 0);
	if (rp->irq <= 0) {
	if (rp->irq < 0) {
		dev_err(dev, "failed to map IRQ: %d\n", rp->irq);
		return -ENODEV;
		return rp->irq;
	}

	/* initialize the IRQ domains */
+3 −0
Original line number Diff line number Diff line
@@ -973,6 +973,9 @@ static int advk_pcie_probe(struct platform_device *pdev)
		return PTR_ERR(pcie->base);

	irq = platform_get_irq(pdev, 0);
	if (irq < 0)
		return irq;

	ret = devm_request_irq(dev, irq, advk_pcie_irq_handler,
			       IRQF_SHARED | IRQF_NO_THREAD, "advk-pcie",
			       pcie);
+2 −2
Original line number Diff line number Diff line
@@ -777,9 +777,9 @@ static int v3_pci_probe(struct platform_device *pdev)

	/* Get and request error IRQ resource */
	irq = platform_get_irq(pdev, 0);
	if (irq <= 0) {
	if (irq < 0) {
		dev_err(dev, "unable to obtain PCIv3 error IRQ\n");
		return -ENODEV;
		return irq;
	}
	ret = devm_request_irq(dev, irq, v3_irq, 0,
			"PCIv3 error", v3);
Loading