Skip to content

Commit 5320eb4

Browse files
Sebastian Andrzej Siewiorzx2c4
authored andcommitted
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 <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 703f706 commit 5320eb4

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

kernel/irq/chip.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,6 @@ EXPORT_SYMBOL_GPL(handle_simple_irq);
575575
*/
576576
void handle_untracked_irq(struct irq_desc *desc)
577577
{
578-
unsigned int flags = 0;
579-
580578
raw_spin_lock(&desc->lock);
581579

582580
if (!irq_may_run(desc))
@@ -593,7 +591,7 @@ void handle_untracked_irq(struct irq_desc *desc)
593591
irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
594592
raw_spin_unlock(&desc->lock);
595593

596-
__handle_irq_event_percpu(desc, &flags);
594+
__handle_irq_event_percpu(desc);
597595

598596
raw_spin_lock(&desc->lock);
599597
irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);

kernel/irq/handle.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action)
136136
wake_up_process(action->thread);
137137
}
138138

139-
irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags)
139+
irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc)
140140
{
141141
irqreturn_t retval = IRQ_NONE;
142142
unsigned int irq = desc->irq_data.irq;
@@ -174,10 +174,6 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags
174174
}
175175

176176
__irq_wake_thread(desc, action);
177-
178-
fallthrough; /* to add to randomness */
179-
case IRQ_HANDLED:
180-
*flags |= action->flags;
181177
break;
182178

183179
default:
@@ -193,9 +189,8 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags
193189
irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
194190
{
195191
irqreturn_t retval;
196-
unsigned int flags = 0;
197192

198-
retval = __handle_irq_event_percpu(desc, &flags);
193+
retval = __handle_irq_event_percpu(desc);
199194

200195
add_interrupt_randomness(desc->irq_data.irq);
201196

kernel/irq/internals.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ extern int __irq_get_irqchip_state(struct irq_data *data,
103103

104104
extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
105105

106-
irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags);
106+
irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc);
107107
irqreturn_t handle_irq_event_percpu(struct irq_desc *desc);
108108
irqreturn_t handle_irq_event(struct irq_desc *desc);
109109

0 commit comments

Comments
 (0)