lkml.org 
[lkml]   [2011]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:irq/core] genirq: Remove bogus conditional
    Commit-ID:  3b56f0585fd4c02d047dc406668cb40159b2d340
    Gitweb: http://git.kernel.org/tip/3b56f0585fd4c02d047dc406668cb40159b2d340
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Wed, 2 Feb 2011 21:41:12 +0000
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Sat, 19 Feb 2011 12:58:10 +0100

    genirq: Remove bogus conditional

    The if (chip->irq_shutdown) check will always evaluate to true, as we
    fill in chip->irq_shutdown with default_shutdown in
    irq_chip_set_defaults() if the chip does not provide its own function.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Peter Zijlstra <peterz@infradead.org>
    LKML-Reference: <20110202212551.667607458@linutronix.de>
    ---
    kernel/irq/manage.c | 5 +----
    1 files changed, 1 insertions(+), 4 deletions(-)

    diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
    index 33a6ee0..30bc8de 100644
    --- a/kernel/irq/manage.c
    +++ b/kernel/irq/manage.c
    @@ -1057,10 +1057,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
    /* If this was the last handler, shut down the IRQ line: */
    if (!desc->action) {
    desc->status |= IRQ_DISABLED;
    - if (desc->irq_data.chip->irq_shutdown)
    - desc->irq_data.chip->irq_shutdown(&desc->irq_data);
    - else
    - desc->irq_data.chip->irq_disable(&desc->irq_data);
    + desc->irq_data.chip->irq_shutdown(&desc->irq_data);
    }

    #ifdef CONFIG_SMP

    \
     
     \ /
      Last update: 2011-02-19 13:25    [W:0.023 / U:0.656 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site