genirq/cpuhotplug: Convert to lock guards

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

diff --git a/kernel/irq/cpuhotplug.c b/kernel/irq/cpuhotplug.c
index 15a7654eff684f06dac92b98e36f2287c017469b..7bd4c2a5cef4b2eb4c4d5595fb05bac9030df9c8 100644 (file)
--- a/kernel/irq/cpuhotplug.c
+++ b/kernel/irq/cpuhotplug.c
@@ -177,9 +177,8 @@ void irq_migrate_all_off_this_cpu(void)
                bool affinity_broken;
 
                desc = irq_to_desc(irq);
-               raw_spin_lock(&desc->lock);
-               affinity_broken = migrate_one_irq(desc);
-               raw_spin_unlock(&desc->lock);
+               scoped_guard(raw_spinlock, &desc->lock)
+                       affinity_broken = migrate_one_irq(desc);
 
                if (affinity_broken) {
                        pr_debug_ratelimited("IRQ %u: no longer affine to CPU%u\n",
@@ -244,9 +243,8 @@ int irq_affinity_online_cpu(unsigned int cpu)
        irq_lock_sparse();
        for_each_active_irq(irq) {
                desc = irq_to_desc(irq);
-               raw_spin_lock_irq(&desc->lock);
-               irq_restore_affinity_of_irq(desc, cpu);
-               raw_spin_unlock_irq(&desc->lock);
+               scoped_guard(raw_spinlock, &desc->lock)
+                       irq_restore_affinity_of_irq(desc, cpu);
        }
        irq_unlock_sparse();