genirq/manage: Rework irq_update_affinity_desc()

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

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 8b4b960f7cd89f920a45c999cc4c5d86aa5b9fe4..81f786da2cdea610d1dfeffd060fe727c119e470 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -395,14 +395,8 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
  * an interrupt which is already started or which has already been configured
  * as managed will also fail, as these mean invalid init state or double init.
  */
-int irq_update_affinity_desc(unsigned int irq,
-                            struct irq_affinity_desc *affinity)
+int irq_update_affinity_desc(unsigned int irq, struct irq_affinity_desc *affinity)
 {
-       struct irq_desc *desc;
-       unsigned long flags;
-       bool activated;
-       int ret = 0;
-
        /*
         * Supporting this with the reservation scheme used by x86 needs
         * some more thought. Fail it for now.
@@ -410,44 +404,38 @@ int irq_update_affinity_desc(unsigned int irq,
        if (IS_ENABLED(CONFIG_GENERIC_IRQ_RESERVATION_MODE))
                return -EOPNOTSUPP;
 
-       desc = irq_get_desc_buslock(irq, &flags, 0);
-       if (!desc)
-               return -EINVAL;
+       scoped_irqdesc_get_and_buslock(irq, 0) {
+               struct irq_desc *desc = scoped_irqdesc;
+               bool activated;
 
-       /* Requires the interrupt to be shut down */
-       if (irqd_is_started(&desc->irq_data)) {
-               ret = -EBUSY;
-               goto out_unlock;
-       }
-
-       /* Interrupts which are already managed cannot be modified */
-       if (irqd_affinity_is_managed(&desc->irq_data)) {
-               ret = -EBUSY;
-               goto out_unlock;
-       }
+               /* Requires the interrupt to be shut down */
+               if (irqd_is_started(&desc->irq_data))
+                       return -EBUSY;
 
-       /*
-        * Deactivate the interrupt. That's required to undo
-        * anything an earlier activation has established.
-        */
-       activated = irqd_is_activated(&desc->irq_data);
-       if (activated)
-               irq_domain_deactivate_irq(&desc->irq_data);
-
-       if (affinity->is_managed) {
-               irqd_set(&desc->irq_data, IRQD_AFFINITY_MANAGED);
-               irqd_set(&desc->irq_data, IRQD_MANAGED_SHUTDOWN);
-       }
+               /* Interrupts which are already managed cannot be modified */
+               if (irqd_affinity_is_managed(&desc->irq_data))
+                       return -EBUSY;
+               /*
+                * Deactivate the interrupt. That's required to undo
+                * anything an earlier activation has established.
+                */
+               activated = irqd_is_activated(&desc->irq_data);
+               if (activated)
+                       irq_domain_deactivate_irq(&desc->irq_data);
 
-       cpumask_copy(desc->irq_common_data.affinity, &affinity->mask);
+               if (affinity->is_managed) {
+                       irqd_set(&desc->irq_data, IRQD_AFFINITY_MANAGED);
+                       irqd_set(&desc->irq_data, IRQD_MANAGED_SHUTDOWN);
+               }
 
-       /* Restore the activation state */
-       if (activated)
-               irq_domain_activate_irq(&desc->irq_data, false);
+               cpumask_copy(desc->irq_common_data.affinity, &affinity->mask);
 
-out_unlock:
-       irq_put_desc_busunlock(desc, flags);
-       return ret;
+               /* Restore the activation state */
+               if (activated)
+                       irq_domain_activate_irq(&desc->irq_data, false);
+               return 0;
+       }
+       return -EINVAL;
 }
 
 static int __irq_set_affinity(unsigned int irq, const struct cpumask *mask,