Commit 5320eb42 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Jason A. Donenfeld
Browse files

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: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
parent 703f7066

kernel/irq/chip.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

kernel/irq/handle.c

+2 −7
Original line number Diff line number Diff line
@@ -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);

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -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);