summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2019-12-12 17:47:24 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-04 19:13:45 +0100
commit947e83724cadb871c2bdb0fabc115b0cc5c62539 (patch)
tree9f1ffcc09579e4a7139c7c4997d9204de97b2fd8
parentbbe414a1ab59bd35fd111e527dcb1eebd9fb4d1f (diff)
downloadlinux-stable-947e83724cadb871c2bdb0fabc115b0cc5c62539.tar.gz
linux-stable-947e83724cadb871c2bdb0fabc115b0cc5c62539.tar.bz2
linux-stable-947e83724cadb871c2bdb0fabc115b0cc5c62539.zip
spi: fsl: use platform_get_irq() instead of of_irq_to_resource()
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>
-rw-r--r--drivers/spi/spi-fsl-spi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index fb34ba3f2b23..8b79e36fab21 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -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;
}