No more users outside of kernel/irq. We really want to have flow handlers in the core code. Signed-off-by: Thomas Gleixner --- Documentation/DocBook/genericirq.tmpl | 10 +++++----- include/linux/irq.h | 3 --- kernel/irq/chip.c | 10 +++++----- kernel/irq/handle.c | 4 ++-- kernel/irq/internals.h | 3 +++ kernel/irq/spurious.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) Index: linux-2.6-tip/Documentation/DocBook/genericirq.tmpl =================================================================== --- linux-2.6-tip.orig/Documentation/DocBook/genericirq.tmpl +++ linux-2.6-tip/Documentation/DocBook/genericirq.tmpl @@ -285,7 +285,7 @@ noop(struct irq_data *data)) The following control flow is implemented (simplified excerpt): desc->chip->irq_mask(); -handle_IRQ_event(desc->action); +handle_irq_event(desc->action); desc->chip->irq_unmask(); @@ -300,7 +300,7 @@ desc->chip->irq_unmask(); The following control flow is implemented (simplified excerpt): -handle_IRQ_event(desc->action); +handle_irq_event(desc->action); desc->chip->irq_eoi(); @@ -325,7 +325,7 @@ do { if (desc->status & masked) desc->chip->irq_unmask(); desc->status &= ~pending; - handle_IRQ_event(desc->action); + handle_irq_event(desc->action); } while (status & pending); desc->status &= ~running; @@ -344,7 +344,7 @@ desc->status &= ~running; The following control flow is implemented (simplified excerpt): -handle_IRQ_event(desc->action); +handle_irq_event(desc->action); @@ -362,7 +362,7 @@ handle_IRQ_event(desc->action); The following control flow is implemented (simplified excerpt): -handle_IRQ_event(desc->action); +handle_irq_event(desc->action); if (desc->chip->irq_eoi) desc->chip->irq_eoi(); Index: linux-2.6-tip/include/linux/irq.h =================================================================== --- linux-2.6-tip.orig/include/linux/irq.h +++ linux-2.6-tip/include/linux/irq.h @@ -236,9 +236,6 @@ static inline void move_masked_irq(int i extern int no_irq_affinity; -/* Handle irq action chains: */ -extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action); - /* * Built-in IRQ handlers for various IRQ types, * callable via desc->handle_irq() Index: linux-2.6-tip/kernel/irq/chip.c =================================================================== --- linux-2.6-tip.orig/kernel/irq/chip.c +++ linux-2.6-tip/kernel/irq/chip.c @@ -492,7 +492,7 @@ handle_simple_irq(unsigned int irq, stru desc->status |= IRQ_INPROGRESS; raw_spin_unlock(&desc->lock); - action_ret = handle_IRQ_event(irq, action); + action_ret = handle_irq_event(irq, action); if (!noirqdebug) note_interrupt(irq, desc, action_ret); @@ -537,7 +537,7 @@ handle_level_irq(unsigned int irq, struc desc->status |= IRQ_INPROGRESS; raw_spin_unlock(&desc->lock); - action_ret = handle_IRQ_event(irq, action); + action_ret = handle_irq_event(irq, action); if (!noirqdebug) note_interrupt(irq, desc, action_ret); @@ -590,7 +590,7 @@ handle_fasteoi_irq(unsigned int irq, str desc->status &= ~IRQ_PENDING; raw_spin_unlock(&desc->lock); - action_ret = handle_IRQ_event(irq, action); + action_ret = handle_irq_event(irq, action); if (!noirqdebug) note_interrupt(irq, desc, action_ret); @@ -669,7 +669,7 @@ handle_edge_irq(unsigned int irq, struct desc->status &= ~IRQ_PENDING; raw_spin_unlock(&desc->lock); - action_ret = handle_IRQ_event(irq, action); + action_ret = handle_irq_event(irq, action); if (!noirqdebug) note_interrupt(irq, desc, action_ret); raw_spin_lock(&desc->lock); @@ -700,7 +700,7 @@ handle_percpu_irq(unsigned int irq, stru if (desc->irq_data.chip->irq_ack) desc->irq_data.chip->irq_ack(&desc->irq_data); - action_ret = handle_IRQ_event(irq, desc->action); + action_ret = handle_irq_event(irq, desc->action); if (!noirqdebug) note_interrupt(irq, desc, action_ret); Index: linux-2.6-tip/kernel/irq/handle.c =================================================================== --- linux-2.6-tip.orig/kernel/irq/handle.c +++ linux-2.6-tip/kernel/irq/handle.c @@ -52,13 +52,13 @@ static void warn_no_thread(unsigned int } /** - * handle_IRQ_event - irq action chain handler + * handle_irq_event - irq action chain handler * @irq: the interrupt number * @action: the interrupt action chain for this irq * * Handles the action chain of an irq event */ -irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) +irqreturn_t handle_irq_event(unsigned int irq, struct irqaction *action) { irqreturn_t ret, retval = IRQ_NONE; unsigned int status = 0; Index: linux-2.6-tip/kernel/irq/internals.h =================================================================== --- linux-2.6-tip.orig/kernel/irq/internals.h +++ linux-2.6-tip/kernel/irq/internals.h @@ -40,6 +40,9 @@ static inline void unregister_handler_pr struct irqaction *action) { } #endif +/* Handle irq action chains: */ +extern irqreturn_t handle_irq_event(unsigned int irq, struct irqaction *action); + extern int irq_select_affinity_usr(unsigned int irq); extern void irq_set_thread_affinity(struct irq_desc *desc); Index: linux-2.6-tip/kernel/irq/spurious.c =================================================================== --- linux-2.6-tip.orig/kernel/irq/spurious.c +++ linux-2.6-tip/kernel/irq/spurious.c @@ -71,7 +71,7 @@ static int try_one_irq(int irq, struct i */ work = 1; raw_spin_unlock(&desc->lock); - handle_IRQ_event(irq, action); + handle_irq_event(irq, action); raw_spin_lock(&desc->lock); desc->status &= ~IRQ_PENDING; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/