diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2025-04-29 08:55:50 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2025-05-07 09:08:16 +0200 |
| commit | 5fec6d5cd24a35f5b03612dd02975e3be1b788b8 (patch) | |
| tree | 657e549dc29cc6710e77a6dcc9342985c8eebfc2 | |
| parent | 65dd1f7ca94fde615684827af285a0475d177b9a (diff) | |
genirq/manage: Rework teardown_percpu_nmi()
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.552884529@linutronix.de
| -rw-r--r-- | kernel/irq/manage.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index c6472b1e4c26..fd5fcf3ea4ed 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -2634,22 +2634,13 @@ int prepare_percpu_nmi(unsigned int irq) */ void teardown_percpu_nmi(unsigned int irq) { - unsigned long flags; - struct irq_desc *desc; - WARN_ON(preemptible()); - desc = irq_get_desc_lock(irq, &flags, - IRQ_GET_DESC_CHECK_PERCPU); - if (!desc) - return; - - if (WARN_ON(!irq_is_nmi(desc))) - goto out; - - irq_nmi_teardown(desc); -out: - irq_put_desc_unlock(desc, flags); + scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_PERCPU) { + if (WARN_ON(!irq_is_nmi(scoped_irqdesc))) + return; + irq_nmi_teardown(scoped_irqdesc); + } } static int __irq_get_irqchip_state(struct irq_data *data, enum irqchip_irq_state which, bool *state) |