Skip to contentSkip to conversation

spi: ppc4xx: Avoid returning 0 when failed to parse and map IRQ

PATCH Superseded Andy Shevchenko 1 participant 2 messages Aug 13, 2024 SPI

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 drivers/spi/spi-ppc4xx.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/spi/spi-ppc4xx.c +2 -3
index 01fdecbf132d..e75a571ae1ba 100644
@@ -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,8 +411,8 @@ 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)
+	hw->irqnum = platform_get_irq(op, 0);
+	if (hw->irqnum < 0)
 		goto free_host;
 
 	ret = request_irq(hw->irqnum, spi_ppc4xx_int,
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#1 lore raw
Quoted 3 lines · Andy Shevchenko

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.

Scratch it, it has the same issue and it seems it predates the mentioned patch as we need to return a real error code.

Signature · 2 lines
With Best Regards,
Andy Shevchenko