Re: [PATCH] irqchip: Convert chained handlers to guard_chained_irq()
From: Chen-Yu Tsai
Date: Wed Nov 18 2026 - 08:45:44 EST
On Sat, Nov 14, 2026 at 11:06 PM Peng Fan <peng.fan@xxxxxxxxx> wrote:
>
> From: Peng Fan <peng.fan@xxxxxxx>
>
> Use the scope-based guard_chained_irq() helper in all chained handlers
> under drivers/irqchip/ so that chained_irq_exit() is always invoked when
> the handler returns. Handlers that duplicated the exit call on an error
> path or jumped to a common exit label simply return now and rely on the
> guard.
>
> No functional changes.
>
> Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
> ---
> With [1] now merged in irq/drivers, convert the chained IRQ handlers in
> drivers/irqchip/ to use guard_chained_irq(). This removes the explicit
> chained_irq_exit() calls and the gotos that only existed to reach them,
> reducing boilerplate.
>
> I use a script to do the job, and after that, do mannual checking.
>
> No functional changes.
>
> [1] https://lore.kernel.org/all/179417458323.2093942.14330197609841896598.tip-bot2@tip-bot2/#t
> ---
> drivers/irqchip/exynos-combiner.c | 7 ++-----
> drivers/irqchip/irq-aclint-sswi.c | 4 +---
> drivers/irqchip/irq-armada-370-xp.c | 4 +---
> drivers/irqchip/irq-aspeed-i2c-ic.c | 4 +---
> drivers/irqchip/irq-aspeed-scu-ic.c | 8 ++------
> drivers/irqchip/irq-ast2700-intc1.c | 4 +---
> drivers/irqchip/irq-ath79-misc.c | 5 +----
> drivers/irqchip/irq-bcm2836.c | 4 +---
> drivers/irqchip/irq-bcm6345-l1.c | 4 +---
> drivers/irqchip/irq-bcm7038-l1.c | 4 +---
> drivers/irqchip/irq-bcm7120-l2.c | 4 +---
> drivers/irqchip/irq-brcmstb-l2.c | 4 +---
> drivers/irqchip/irq-dw-apb-ictl.c | 4 +---
> drivers/irqchip/irq-econet-en751221.c | 4 +---
> drivers/irqchip/irq-gic.c | 6 ++----
> drivers/irqchip/irq-goldfish-pic.c | 4 +---
> drivers/irqchip/irq-idt3243x.c | 4 +---
> drivers/irqchip/irq-imx-intmux.c | 4 +---
> drivers/irqchip/irq-imx-irqsteer.c | 7 ++-----
> drivers/irqchip/irq-imx-mu-msi.c | 3 +--
> drivers/irqchip/irq-ingenic-tcu.c | 4 +---
> drivers/irqchip/irq-lan966x-oic.c | 3 +--
> drivers/irqchip/irq-loongarch-avec.c | 4 +---
> drivers/irqchip/irq-loongson-eiointc.c | 4 +---
> drivers/irqchip/irq-loongson-htpic.c | 3 +--
> drivers/irqchip/irq-loongson-htvec.c | 4 +---
> drivers/irqchip/irq-loongson-liointc.c | 4 +---
> drivers/irqchip/irq-loongson-pch-lpc.c | 3 +--
> drivers/irqchip/irq-lpc32xx.c | 4 +---
> drivers/irqchip/irq-ls-scfg-msi.c | 4 +---
> drivers/irqchip/irq-ls1x.c | 4 +---
> drivers/irqchip/irq-mmp.c | 7 ++-----
> drivers/irqchip/irq-mscc-ocelot.c | 4 +---
> drivers/irqchip/irq-mvebu-pic.c | 4 +---
> drivers/irqchip/irq-mvebu-sei.c | 4 +---
> drivers/irqchip/irq-pruss-intc.c | 4 +---
> drivers/irqchip/irq-realtek-rtl.c | 7 ++-----
> drivers/irqchip/irq-riscv-aplic-direct.c | 4 +---
> drivers/irqchip/irq-riscv-imsic-early.c | 4 +---
> drivers/irqchip/irq-sifive-plic.c | 8 ++------
> drivers/irqchip/irq-sp7021-intc.c | 4 +---
> drivers/irqchip/irq-starfive-jhb100-intc.c | 4 +---
> drivers/irqchip/irq-stm32-exti.c | 4 +---
> drivers/irqchip/irq-sunxi-nmi.c | 3 +--
Acked-by: Chen-Yu Tsai <wens@xxxxxxxxxx> # sunxi-nmi