genirq/manage: Rework __disable_irq_nosync()

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

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index c18440d4148000962fb7856279094bc5c79a2055..edc8118799c91221318969ebd297167ed51f0501 100644 (file)
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -659,14 +659,11 @@ void __disable_irq(struct irq_desc *desc)
 
 static int __disable_irq_nosync(unsigned int irq)
 {
-       unsigned long flags;
-       struct irq_desc *desc = irq_get_desc_buslock(irq, &flags, IRQ_GET_DESC_CHECK_GLOBAL);
-
-       if (!desc)
-               return -EINVAL;
-       __disable_irq(desc);
-       irq_put_desc_busunlock(desc, flags);
-       return 0;
+       scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_GLOBAL) {
+               __disable_irq(scoped_irqdesc);
+               return 0;
+       }
+       return -EINVAL;
 }
 
 /**