]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
uio_pdrv_genirq: Remove warning when irq is not specified
authorEsben Haabendal <esben@geanix.com>
Wed, 1 Jul 2020 14:56:57 +0000 (16:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Jul 2020 07:33:13 +0000 (09:33 +0200)
commit 324ac45f25e634eca6346953ae531e8da3e0c73d upstream.

Since e3a3c3a20555 ("UIO: fix uio_pdrv_genirq with device tree but no
interrupt"), the uio_pdrv_genirq has supported use without interrupt,
so the change in 7723f4c5ecdb ("driver core: platform: Add an error
message to") added false warnings for those cases.

Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()")
Signed-off-by: Esben Haabendal <esben@geanix.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200701145659.3978-2-esben@geanix.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uio/uio_pdrv_genirq.c

index 1303b165055ba42d87d2f7f77386d7e47eb856b9..a28f16bfa64db10fee3d8edd1badef35e00a7268 100644 (file)
@@ -152,7 +152,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev)
        priv->pdev = pdev;
 
        if (!uioinfo->irq) {
-               ret = platform_get_irq(pdev, 0);
+               ret = platform_get_irq_optional(pdev, 0);
                uioinfo->irq = ret;
                if (ret == -ENXIO && pdev->dev.of_node)
                        uioinfo->irq = UIO_IRQ_NONE;