]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
irqchip: Drop leftover brackets
authorJohan Hovold <johan@kernel.org>
Mon, 13 Oct 2025 09:46:10 +0000 (11:46 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Dec 2025 13:02:31 +0000 (14:02 +0100)
[ Upstream commit 3540d99c03a88d4ebf65026f1f1926d3af658fb1 ]

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>
Stable-dep-of: 1e3e330c0707 ("irqchip: Pass platform device to platform drivers")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/irqchip/irqchip.c

index 0ee7b6b71f5fa5d0b4480d6a8ce9d7122b4701b0..652d20d2b07f182b383001467a3b650dfd903faf 100644 (file)
@@ -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);
 }