aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2024-08-14 17:45:12 +0300
committerMark Brown <broonie@kernel.org>2024-08-14 18:26:50 +0100
commit7781f1d120fec8624fc654eda900fc8748262082 (patch)
treedd6bfe20cfb6e0db073d228f562ed769567b0e1f
parentspi: ppc4xx: handle irq_of_parse_and_map() errors (diff)
downloadwireguard-linux-7781f1d120fec8624fc654eda900fc8748262082.tar.xz
wireguard-linux-7781f1d120fec8624fc654eda900fc8748262082.zip
spi: ppc4xx: Avoid returning 0 when failed to parse and map IRQ
0 is incorrect error code when failed to parse and map IRQ. Replace OF specific old API for IRQ retrieval with a generic one to fix this issue. Fixes: 0f245463b01e ("spi: ppc4xx: handle irq_of_parse_and_map() errors") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/20240814144525.2648450-1-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/spi/spi-ppc4xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c
index 599c29a31269..6071f83dd9c8 100644
--- a/drivers/spi/spi-ppc4xx.c
+++ b/drivers/spi/spi-ppc4xx.c
@@ -27,7 +27,6 @@
#include <linux/wait.h>
#include <linux/platform_device.h>
#include <linux/of_address.h>
-#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
@@ -412,9 +411,10 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
}
/* Request IRQ */
- hw->irqnum = irq_of_parse_and_map(np, 0);
- if (hw->irqnum <= 0)
+ ret = platform_get_irq(op, 0);
+ if (ret < 0)
goto free_host;
+ hw->irqnum = ret;
if (hw->irqnum <= 0)
goto free_host;