]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
genirq/chip: Rework irq_set_handler_data()
authorThomas Gleixner <tglx@linutronix.de>
Tue, 29 Apr 2025 06:55:22 +0000 (08:55 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 7 May 2025 07:08:14 +0000 (09:08 +0200)
Use the new guards to get and lock the interrupt descriptor and tidy up the
code.

Fixup the kernel doc comment while at it.

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.415072350@linutronix.de
kernel/irq/chip.c

index 0904886fb2f7f3a1f80a7c413fa06edbb65700ec..7694e3e79f38f47e3e72bea2e15ce81ac0d9268e 100644 (file)
@@ -67,22 +67,19 @@ int irq_set_irq_type(unsigned int irq, unsigned int type)
 EXPORT_SYMBOL(irq_set_irq_type);
 
 /**
- *     irq_set_handler_data - set irq handler data for an irq
- *     @irq:   Interrupt number
- *     @data:  Pointer to interrupt specific data
+ * irq_set_handler_data - set irq handler data for an irq
+ * @irq:       Interrupt number
+ * @data:      Pointer to interrupt specific data
  *
- *     Set the hardware irq controller data for an irq
+ * Set the hardware irq controller data for an irq
  */
 int irq_set_handler_data(unsigned int irq, void *data)
 {
-       unsigned long flags;
-       struct irq_desc *desc = irq_get_desc_lock(irq, &flags, 0);
-
-       if (!desc)
-               return -EINVAL;
-       desc->irq_common_data.handler_data = data;
-       irq_put_desc_unlock(desc, flags);
-       return 0;
+       scoped_irqdesc_get_and_lock(irq, 0) {
+               scoped_irqdesc->irq_common_data.handler_data = data;
+               return 0;
+       }
+       return -EINVAL;
 }
 EXPORT_SYMBOL(irq_set_handler_data);