lkml.org 
[lkml]   [2011]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 29/75] 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 | 17 +++++------------
    1 file changed, 5 insertions(+), 12 deletions(-)

    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
    @@ -51,10 +51,11 @@ static void warn_no_thread(unsigned int
    "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(un
    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;
    + return retval;
    }

    irqreturn_t handle_irq_event(struct irq_desc *desc)
    @@ -149,5 +142,5 @@ irqreturn_t handle_irq_event(struct irq_
    */
    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);
    }



    \
     
     \ /
      Last update: 2011-02-11 00:51    [W:0.023 / U:62.304 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site