genirq/chip: Rework handle_simple_irq()

Use the new helpers to decide whether the interrupt should be handled and
switch the descriptor locking to guard().

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

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 87add4b103518df7ce4b96b08ed0f1bf3ee20b4e..8a1e54ed5c5f755221241068c474b4795fd9178b 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -538,35 +538,25 @@ void handle_nested_irq(unsigned int irq)
 EXPORT_SYMBOL_GPL(handle_nested_irq);
 
 /**
- *     handle_simple_irq - Simple and software-decoded IRQs.
- *     @desc:  the interrupt description structure for this irq
+ * handle_simple_irq - Simple and software-decoded IRQs.
+ * @desc:      the interrupt description structure for this irq
  *
- *     Simple interrupts are either sent from a demultiplexing interrupt
- *     handler or come from hardware, where no interrupt hardware control
- *     is necessary.
+ * Simple interrupts are either sent from a demultiplexing interrupt
+ * handler or come from hardware, where no interrupt hardware control is
+ * necessary.
  *
- *     Note: The caller is expected to handle the ack, clear, mask and
- *     unmask issues if necessary.
+ * Note: The caller is expected to handle the ack, clear, mask and unmask
+ * issues if necessary.
  */
 void handle_simple_irq(struct irq_desc *desc)
 {
-       raw_spin_lock(&desc->lock);
-
-       if (!irq_can_handle_pm(desc))
-               goto out_unlock;
-
-       desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
+       guard(raw_spinlock)(&desc->lock);
 
-       if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
-               desc->istate |= IRQS_PENDING;
-               goto out_unlock;
-       }
+       if (!irq_can_handle(desc))
+               return;
 
        kstat_incr_irqs_this_cpu(desc);
        handle_irq_event(desc);
-
-out_unlock:
-       raw_spin_unlock(&desc->lock);
 }
 EXPORT_SYMBOL_GPL(handle_simple_irq);