irq: remove unused flags argument from __handle_irq_event_percpu()

The __IRQF_TIMER bit from the flags argument was used in
add_interrupt_randomness() to distinguish the timer interrupt from other
interrupts. This is no longer the case.

Remove the flags argument from __handle_irq_event_percpu().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index f895265d754870aa505ed526f70dcaf8245c2c95..c09324663088294e43ccf37eae21a60c7f098dba 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -575,8 +575,6 @@ EXPORT_SYMBOL_GPL(handle_simple_irq);
  */
 void handle_untracked_irq(struct irq_desc *desc)
 {
-       unsigned int flags = 0;
-
        raw_spin_lock(&desc->lock);
 
        if (!irq_may_run(desc))
@@ -593,7 +591,7 @@ void handle_untracked_irq(struct irq_desc *desc)
        irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
        raw_spin_unlock(&desc->lock);
 
-       __handle_irq_event_percpu(desc, &flags);
+       __handle_irq_event_percpu(desc);
 
        raw_spin_lock(&desc->lock);
        irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 68c76c3caaf55874948a6a588633efc313023dac..9489f93b3db34431aa71594a95d7a20e6ec1442c 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -136,7 +136,7 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action)
        wake_up_process(action->thread);
 }
 
-irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags)
+irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc)
 {
        irqreturn_t retval = IRQ_NONE;
        unsigned int irq = desc->irq_data.irq;
@@ -174,10 +174,6 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags
                        }
 
                        __irq_wake_thread(desc, action);
-
-                       fallthrough;    /* to add to randomness */
-               case IRQ_HANDLED:
-                       *flags |= action->flags;
                        break;
 
                default:
@@ -193,9 +189,8 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags
 irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
 {
        irqreturn_t retval;
-       unsigned int flags = 0;
 
-       retval = __handle_irq_event_percpu(desc, &flags);
+       retval = __handle_irq_event_percpu(desc);
 
        add_interrupt_randomness(desc->irq_data.irq);
 

diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 54363527feea4dcd302f9a8a36edc12df0d196cc..99cbdf55a8bda0db2494aa4433a62d0ee060fe07 100644 (file)
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -103,7 +103,7 @@ extern int __irq_get_irqchip_state(struct irq_data *data,
 
 extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
 
-irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags);
+irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc);
 irqreturn_t handle_irq_event_percpu(struct irq_desc *desc);
 irqreturn_t handle_irq_event(struct irq_desc *desc);