timers/migration: Use scoped_guard on available flag set/clear

Cleanup tmigr_clear_cpu_available() and tmigr_set_cpu_available() to
prepare for easier checks on the available flag.

Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://patch.msgid.link/20251120145653.296659-4-gmonaco@redhat.com

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 3325ca7989b3c0b49903e7c20a524208bdb1e33e..a01c7f8bdf52144471c8e20c58d5421c182a19b3 100644 (file)
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -1440,17 +1440,17 @@ static int tmigr_clear_cpu_available(unsigned int cpu)
        u64 firstexp;
 
        cpumask_clear_cpu(cpu, tmigr_available_cpumask);
-       raw_spin_lock_irq(&tmc->lock);
-       tmc->available = false;
-       WRITE_ONCE(tmc->wakeup, KTIME_MAX);
+       scoped_guard(raw_spinlock_irq, &tmc->lock) {
+               tmc->available = false;
+               WRITE_ONCE(tmc->wakeup, KTIME_MAX);
 
-       /*
-        * CPU has to handle the local events on his own, when on the way to
-        * offline; Therefore nextevt value is set to KTIME_MAX
-        */
-       firstexp = __tmigr_cpu_deactivate(tmc, KTIME_MAX);
-       trace_tmigr_cpu_unavailable(tmc);
-       raw_spin_unlock_irq(&tmc->lock);
+               /*
+                * CPU has to handle the local events on his own, when on the way to
+                * offline; Therefore nextevt value is set to KTIME_MAX
+                */
+               firstexp = __tmigr_cpu_deactivate(tmc, KTIME_MAX);
+               trace_tmigr_cpu_unavailable(tmc);
+       }
 
        if (firstexp != KTIME_MAX) {
                migrator = cpumask_any(tmigr_available_cpumask);
@@ -1469,13 +1469,13 @@ static int tmigr_set_cpu_available(unsigned int cpu)
                return -EINVAL;
 
        cpumask_set_cpu(cpu, tmigr_available_cpumask);
-       raw_spin_lock_irq(&tmc->lock);
-       trace_tmigr_cpu_available(tmc);
-       tmc->idle = timer_base_is_idle();
-       if (!tmc->idle)
-               __tmigr_cpu_activate(tmc);
-       tmc->available = true;
-       raw_spin_unlock_irq(&tmc->lock);
+       scoped_guard(raw_spinlock_irq, &tmc->lock) {
+               trace_tmigr_cpu_available(tmc);
+               tmc->idle = timer_base_is_idle();
+               if (!tmc->idle)
+                       __tmigr_cpu_activate(tmc);
+               tmc->available = true;
+       }
        return 0;
 }