genirq/chip: Rework irq_modify_status()

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

Fixup the kernel doc comment while at it.

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/20250429065421.650454052@linutronix.de

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 7f1c640bff079ba3bc9f69b452b33b4f3aa4e9c3..865cf74a9ab516a6f7a3d2e85f10cb89a281ac6f 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -972,38 +972,34 @@ EXPORT_SYMBOL_GPL(irq_set_chip_and_handler_name);
 
 void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
 {
-       unsigned long flags, trigger, tmp;
-       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
-
-       if (!desc)
-               return;
-
-       /*
-        * Warn when a driver sets the no autoenable flag on an already
-        * active interrupt.
-        */
-       WARN_ON_ONCE(!desc->depth && (set & _IRQ_NOAUTOEN));
-
-       irq_settings_clr_and_set(desc, clr, set);
+       scoped_irqdesc_get_and_lock(irq, 0) {
+               struct irq_desc *desc = scoped_irqdesc;
+               unsigned long trigger, tmp;
+               /*
+                * Warn when a driver sets the no autoenable flag on an already
+                * active interrupt.
+                */
+               WARN_ON_ONCE(!desc->depth && (set & _IRQ_NOAUTOEN));
 
-       trigger = irqd_get_trigger_type(&desc->irq_data);
+               irq_settings_clr_and_set(desc, clr, set);
 
-       irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
-                  IRQD_TRIGGER_MASK | IRQD_LEVEL);
-       if (irq_settings_has_no_balance_set(desc))
-               irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
-       if (irq_settings_is_per_cpu(desc))
-               irqd_set(&desc->irq_data, IRQD_PER_CPU);
-       if (irq_settings_is_level(desc))
-               irqd_set(&desc->irq_data, IRQD_LEVEL);
+               trigger = irqd_get_trigger_type(&desc->irq_data);
 
-       tmp = irq_settings_get_trigger_mask(desc);
-       if (tmp != IRQ_TYPE_NONE)
-               trigger = tmp;
+               irqd_clear(&desc->irq_data, IRQD_NO_BALANCING | IRQD_PER_CPU |
+                          IRQD_TRIGGER_MASK | IRQD_LEVEL);
+               if (irq_settings_has_no_balance_set(desc))
+                       irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
+               if (irq_settings_is_per_cpu(desc))
+                       irqd_set(&desc->irq_data, IRQD_PER_CPU);
+               if (irq_settings_is_level(desc))
+                       irqd_set(&desc->irq_data, IRQD_LEVEL);
 
-       irqd_set(&desc->irq_data, trigger);
+               tmp = irq_settings_get_trigger_mask(desc);
+               if (tmp != IRQ_TYPE_NONE)
+                       trigger = tmp;
 
-       irq_put_desc_unlock(desc, flags);
+               irqd_set(&desc->irq_data, trigger);
+       }
 }
 EXPORT_SYMBOL_GPL(irq_modify_status);