From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 29 Apr 2025 06:55:46 +0000 (+0200)
Subject: genirq/manage: Rework irq_percpu_is_enabled()
X-Git-Tag: v6.16-rc1~189^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b171f712d6ef1ae073d18e8ea9df1e96eb34f226;p=thirdparty%2Fkernel%2Flinux.git

genirq/manage: Rework irq_percpu_is_enabled()

Use the new guards to get and lock the interrupt descriptor and tidy up the
code.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/all/20250429065422.376836282@linutronix.de
---

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index e27fa4e2fd1e0..3a491c7c06796 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -2322,19 +2322,9 @@ void enable_percpu_nmi(unsigned int irq, unsigned int type)
  */
 bool irq_percpu_is_enabled(unsigned int irq)
 {
-	unsigned int cpu = smp_processor_id();
-	struct irq_desc *desc;
-	unsigned long flags;
-	bool is_enabled;
-
-	desc = irq_get_desc_lock(irq, &flags, IRQ_GET_DESC_CHECK_PERCPU);
-	if (!desc)
-		return false;
-
-	is_enabled = cpumask_test_cpu(cpu, desc->percpu_enabled);
-	irq_put_desc_unlock(desc, flags);
-
-	return is_enabled;
+	scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_PERCPU)
+		return cpumask_test_cpu(smp_processor_id(), scoped_irqdesc->percpu_enabled);
+	return false;
 }
 EXPORT_SYMBOL_GPL(irq_percpu_is_enabled);