[tip: irq/core] genirq: Reuse irq_thread_fn() for forced thread case

From: tip-bot2 for Andy Shevchenko
Date: Tue Dec 03 2024 - 06:03:02 EST


The following commit has been merged into the irq/core branch of tip:

Commit-ID: 429f49ad361cd999ca221d8b562ae2552b7c3e2c
Gitweb: https://git.kernel.org/tip/429f49ad361cd999ca221d8b562ae2552b7c3e2c
Author: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
AuthorDate: Tue, 19 Nov 2024 12:42:35 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 03 Dec 2024 11:59:10 +01:00

genirq: Reuse irq_thread_fn() for forced thread case

rq_forced_thread_fn() uses the same action callback as the non-forced
variant but with different locking decorations. Reuse irq_thread_fn() here
to make that clear.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20241119104339.2112455-3-andriy.shevchenko@xxxxxxxxxxxxxxx

---
kernel/irq/manage.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 230f470..f300bb6 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1210,11 +1210,7 @@ static irqreturn_t irq_forced_thread_fn(struct irq_desc *desc, struct irqaction
local_bh_disable();
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_disable();
- ret = action->thread_fn(action->irq, action->dev_id);
- if (ret == IRQ_HANDLED)
- atomic_inc(&desc->threads_handled);
-
- irq_finalize_oneshot(desc, action);
+ ret = irq_thread_fn(desc, action);
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
local_irq_enable();
local_bh_enable();