From 1277a5325adfc53caac7dd3dac5d3d2fd2a125b4 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 7 Feb 2011 01:40:27 +0100
Subject: genirq: Simplify handle_irq_event()
Now that all core users are converted one layer can go.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/irq/handle.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
(limited to 'kernel/irq')
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 4ef059478ebf..ff40e0f5e2e2 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -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);
@@ -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)
@@ -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);
}
--
cgit v1.2.3-70-g09d2