UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

genirq: Simplify handle_irq_event() 

Now that all core users are converted one layer can go.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-02-07 01:40:27 +01:00
parent 0877d66257
commit 1277a5325a
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/irq/handle.c
View File

@ -51,10 +51,11 @@ static void warn_no_thread(unsigned int irq, struct irqaction *action)
"but no thread function available.", irq, action->name); "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; irqreturn_t ret, retval = IRQ_NONE;
unsigned int status = 0; unsigned int status = 0, irq = desc->irq_data.irq;
do { do {
trace_irq_handler_entry(irq, action); trace_irq_handler_entry(irq, action);
@ -111,17 +112,9 @@ static irqreturn_t __handle_irq_event(unsigned int irq, struct irqaction *action
if (status & IRQF_SAMPLE_RANDOM) if (status & IRQF_SAMPLE_RANDOM)
add_interrupt_randomness(irq); 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) if (!noirqdebug)
note_interrupt(desc->irq_data.irq, desc, ret); note_interrupt(irq, desc, ret);
return ret; return retval;
} }
irqreturn_t handle_irq_event(struct irq_desc *desc) irqreturn_t handle_irq_event(struct irq_desc *desc)
@ -149,5 +142,5 @@ irqreturn_t handle_irq_event(struct irq_desc *desc)
*/ */
irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) 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);
} }