genirq/manage: Rework irq_set_irqchip_state()

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

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 1783c5294df587f2b13d6b4275d558a80878bd21..827edc89460ef3c2b488e8b9e337dedfdbdfc996 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -2703,39 +2703,26 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state);
  */
 int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which, bool val)
 {
-       struct irq_desc *desc;
-       struct irq_data *data;
-       struct irq_chip *chip;
-       unsigned long flags;
-       int err = -EINVAL;
+       scoped_irqdesc_get_and_buslock(irq, 0) {
+               struct irq_data *data = irq_desc_get_irq_data(scoped_irqdesc);
+               struct irq_chip *chip;
 
-       desc = irq_get_desc_buslock(irq, &flags, 0);
-       if (!desc)
-               return err;
+               do {
+                       chip = irq_data_get_irq_chip(data);
 
-       data = irq_desc_get_irq_data(desc);
+                       if (WARN_ON_ONCE(!chip))
+                               return -ENODEV;
 
-       do {
-               chip = irq_data_get_irq_chip(data);
-               if (WARN_ON_ONCE(!chip)) {
-                       err = -ENODEV;
-                       goto out_unlock;
-               }
-               if (chip->irq_set_irqchip_state)
-                       break;
-#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
-               data = data->parent_data;
-#else
-               data = NULL;
-#endif
-       } while (data);
+                       if (chip->irq_set_irqchip_state)
+                               break;
 
-       if (data)
-               err = chip->irq_set_irqchip_state(data, which, val);
+                       data = irqd_get_parent_data(data);
+               } while (data);
 
-out_unlock:
-       irq_put_desc_busunlock(desc, flags);
-       return err;
+               if (data)
+                       return chip->irq_set_irqchip_state(data, which, val);
+       }
+       return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(irq_set_irqchip_state);