Browse Source

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: Huang Shijie <shijie.huang@arm.com>
Reviewed-by: Jiang 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: Thomas Gleixner <tglx@linutronix.de>
Huang Shijie 10 years ago
parent
commit
71f64340fc
3 changed files with 5 additions and 6 deletions
  1. 1 1
      kernel/irq/chip.c
  2. 3 4
      kernel/irq/handle.c
  3. 1 1
      kernel/irq/internals.h

+ 1 - 1
kernel/irq/chip.c

@@ -669,7 +669,7 @@ void handle_percpu_irq(struct irq_desc *desc)
 	if (chip->irq_ack)
 	if (chip->irq_ack)
 		chip->irq_ack(&desc->irq_data);
 		chip->irq_ack(&desc->irq_data);
 
 
-	handle_irq_event_percpu(desc, desc->action);
+	handle_irq_event_percpu(desc);
 
 
 	if (chip->irq_eoi)
 	if (chip->irq_eoi)
 		chip->irq_eoi(&desc->irq_data);
 		chip->irq_eoi(&desc->irq_data);

+ 3 - 4
kernel/irq/handle.c

@@ -132,11 +132,11 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action)
 	wake_up_process(action->thread);
 	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;
 	irqreturn_t retval = IRQ_NONE;
 	unsigned int flags = 0, irq = desc->irq_data.irq;
 	unsigned int flags = 0, irq = desc->irq_data.irq;
+	struct irqaction *action = desc->action;
 
 
 	do {
 	do {
 		irqreturn_t res;
 		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)
 irqreturn_t handle_irq_event(struct irq_desc *desc)
 {
 {
-	struct irqaction *action = desc->action;
 	irqreturn_t ret;
 	irqreturn_t ret;
 
 
 	desc->istate &= ~IRQS_PENDING;
 	desc->istate &= ~IRQS_PENDING;
 	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 	irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 	raw_spin_unlock(&desc->lock);
 	raw_spin_unlock(&desc->lock);
 
 
-	ret = handle_irq_event_percpu(desc, action);
+	ret = handle_irq_event_percpu(desc);
 
 
 	raw_spin_lock(&desc->lock);
 	raw_spin_lock(&desc->lock);
 	irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);
 	irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS);

+ 1 - 1
kernel/irq/internals.h

@@ -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);
 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);
 irqreturn_t handle_irq_event(struct irq_desc *desc);
 
 
 /* Resending of interrupts :*/
 /* Resending of interrupts :*/