Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f64340 authored by Huang Shijie's avatar Huang Shijie Committed by Thomas Gleixner
Browse files

genirq: Remove the second parameter from handle_irq_event_percpu() 



Actually, we always use the first irq action of the @desc->action
chain, so remove the second parameter from handle_irq_event_percpu()
which makes the code more tidy.

Signed-off-by: default avatarHuang Shijie <shijie.huang@arm.com>
Reviewed-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: peterz@infradead.org
Cc: marc.zyngier@arm.com
Link: http://lkml.kernel.org/r/1441160695-19809-1-git-send-email-shijie.huang@arm.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b55a3bb8

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ void handle_percpu_irq(struct irq_desc *desc) 
	if (chip->irq_ack)

		chip->irq_ack(&desc->irq_data);



	handle_irq_event_percpu(desc, desc->action);

	handle_irq_event_percpu(desc);



	if (chip->irq_eoi)

		chip->irq_eoi(&desc->irq_data);

kernel/irq/handle.c

+3 −4
Original line number Diff line number Diff line
@@ -132,11 +132,11 @@ 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, struct irqaction *action)

irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)

{

	irqreturn_t retval = IRQ_NONE;

	unsigned int flags = 0, irq = desc->irq_data.irq;

	struct irqaction *action = desc->action;



	do {

		irqreturn_t res;
@@ -184,14 +184,13 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) 


irqreturn_t handle_irq_event(struct irq_desc *desc)

{

	struct irqaction *action = desc->action;

	irqreturn_t ret;



	desc->istate &= ~IRQS_PENDING;

	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);

	raw_spin_unlock(&desc->lock);



	ret = handle_irq_event_percpu(desc, action);

	ret = handle_irq_event_percpu(desc);



	raw_spin_lock(&desc->lock);

	irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);

kernel/irq/internals.h

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ extern void irq_mark_irq(unsigned int irq); 


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



irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action);

irqreturn_t handle_irq_event_percpu(struct irq_desc *desc);

irqreturn_t handle_irq_event(struct irq_desc *desc);



/* Resending of interrupts :*/