Skip to content

Commit

Permalink
genirq: Simplify handle_irq_event()
Browse files Browse the repository at this point in the history
Now that all core users are converted one layer can go.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Feb 19, 2011
1 parent 0877d66 commit 1277a53
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions kernel/irq/handle.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ static void warn_no_thread(unsigned int irq, struct irqaction *action)
"but no thread function available.", irq, action->name);
}

static irqreturn_t __handle_irq_event(unsigned int irq, struct irqaction *action)
irqreturn_t
handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
{
irqreturn_t ret, retval = IRQ_NONE;
unsigned int status = 0;
unsigned int status = 0, irq = desc->irq_data.irq;

do {
trace_irq_handler_entry(irq, action);
Expand Down Expand Up @@ -111,17 +112,9 @@ static irqreturn_t __handle_irq_event(unsigned int irq, struct irqaction *action
if (status & IRQF_SAMPLE_RANDOM)
add_interrupt_randomness(irq);

return retval;
}

irqreturn_t
handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
{
irqreturn_t ret = __handle_irq_event(desc->irq_data.irq, action);

if (!noirqdebug)
note_interrupt(desc->irq_data.irq, desc, ret);
return ret;
note_interrupt(irq, desc, ret);
return retval;
}

irqreturn_t handle_irq_event(struct irq_desc *desc)
Expand Down Expand Up @@ -149,5 +142,5 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
*/
irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action)
{
return __handle_irq_event(irq, action);
return handle_irq_event_percpu(irq_to_desc(irq), action);
}

0 comments on commit 1277a53

Please sign in to comment.