]> git.itanic.dy.fi Git - linux-stable/commitdiff
spi: fsl: use platform_get_irq() instead of of_irq_to_resource()
authorChristophe Leroy <christophe.leroy@c-s.fr>
Thu, 12 Dec 2019 17:47:24 +0000 (17:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 4 Jan 2020 13:00:23 +0000 (14:00 +0100)
commit 63aa6a692595d47a0785297b481072086b9272d2 upstream.

Unlike irq_of_parse_and_map() which has a dummy definition on SPARC,
of_irq_to_resource() hasn't.

But as platform_get_irq() can be used instead and is generic, use it.

Reported-by: kbuild test robot <lkp@intel.com>
Suggested-by: Mark Brown <broonie@kernel.org>
Fixes: 3194d2533eff ("spi: fsl: don't map irq during probe")
Cc: stable@vger.kernel.org
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Link: https://lore.kernel.org/r/091a277fd0b3356dca1e29858c1c96983fc9cb25.1576172743.git.christophe.leroy@c-s.fr
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/spi/spi-fsl-spi.c

index fb34ba3f2b234b60e500a3a6bdfb3408d74e3677..8b79e36fab21c478d673d6f654e4df590483da66 100644 (file)
@@ -832,9 +832,9 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
        if (ret)
                goto err;
 
-       irq = of_irq_to_resource(np, 0, NULL);
-       if (irq <= 0) {
-               ret = -EINVAL;
+       irq = platform_get_irq(ofdev, 0);
+       if (irq < 0) {
+               ret = irq;
                goto err;
        }