The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: 3540d99c03a88d4ebf65026f1f1926d3af658fb1
Gitweb: https://git.kernel.org/tip/3540d99c03a88d4ebf65026f1f1926d3af658fb1
Author: Johan Hovold <johan@kernel.org>
AuthorDate: Mon, 13 Oct 2025 11:46:10 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 16 Oct 2025 11:30:38 +02:00
irqchip: Drop leftover brackets
Drop some unnecessary brackets in platform_irqchip_probe() mistakenly
left by commit 9322d1915f9d ("irqchip: Plug a OF node reference leak in
platform_irqchip_probe()").
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
drivers/irqchip/irqchip.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index 0ee7b6b..652d20d 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -38,9 +38,8 @@ int platform_irqchip_probe(struct platform_device *pdev)
struct device_node *par_np __free(device_node) = of_irq_find_parent(np);
of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev);
- if (!irq_init_cb) {
+ if (!irq_init_cb)
return -EINVAL;
- }
if (par_np == np)
par_np = NULL;
@@ -53,9 +52,8 @@ int platform_irqchip_probe(struct platform_device *pdev)
* interrupt controller. The actual initialization callback of this
* interrupt controller can check for specific domains as necessary.
*/
- if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) {
+ if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY))
return -EPROBE_DEFER;
- }
return irq_init_cb(np, par_np);
}