genirq/chip: Use lock guards where applicable

Convert all lock/unlock pairs to guards 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/20250429065421.236248749@linutronix.de

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 2b23630f4c6303d8e35f67628ccfacf8a5fc5b2a..daa356a94ab3feb12e80763795f3ff5acfaae391 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -1049,25 +1049,21 @@ EXPORT_SYMBOL_GPL(irq_modify_status);
  */
 void irq_cpu_online(void)
 {
-       struct irq_desc *desc;
-       struct irq_chip *chip;
-       unsigned long flags;
        unsigned int irq;
 
        for_each_active_irq(irq) {
-               desc = irq_to_desc(irq);
+               struct irq_desc *desc = irq_to_desc(irq);
+               struct irq_chip *chip;
+
                if (!desc)
                        continue;
 
-               raw_spin_lock_irqsave(&desc->lock, flags);
-
+               guard(raw_spinlock_irqsave)(&desc->lock);
                chip = irq_data_get_irq_chip(&desc->irq_data);
                if (chip && chip->irq_cpu_online &&
                    (!(chip->flags & IRQCHIP_ONOFFLINE_ENABLED) ||
                     !irqd_irq_disabled(&desc->irq_data)))
                        chip->irq_cpu_online(&desc->irq_data);
-
-               raw_spin_unlock_irqrestore(&desc->lock, flags);
        }
 }
 
@@ -1079,25 +1075,21 @@ void irq_cpu_online(void)
  */
 void irq_cpu_offline(void)
 {
-       struct irq_desc *desc;
-       struct irq_chip *chip;
-       unsigned long flags;
        unsigned int irq;
 
        for_each_active_irq(irq) {
-               desc = irq_to_desc(irq);
+               struct irq_desc *desc = irq_to_desc(irq);
+               struct irq_chip *chip;
+
                if (!desc)
                        continue;
 
-               raw_spin_lock_irqsave(&desc->lock, flags);
-
+               guard(raw_spinlock_irqsave)(&desc->lock);
                chip = irq_data_get_irq_chip(&desc->irq_data);
                if (chip && chip->irq_cpu_offline &&
                    (!(chip->flags & IRQCHIP_ONOFFLINE_ENABLED) ||
                     !irqd_irq_disabled(&desc->irq_data)))
                        chip->irq_cpu_offline(&desc->irq_data);
-
-               raw_spin_unlock_irqrestore(&desc->lock, flags);
        }
 }
 #endif