lkml.org 
[lkml]   [2010]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 08/19] genirq; Provide compat handling for chip->mask_ack()
    Wrap the old chip function mask_ack() until the migration is complete
    and the old chip functions are removed.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    kernel/irq/chip.c | 20 ++++++++++++++++++--
    kernel/irq/internals.h | 17 +++++++++++------
    kernel/irq/manage.c | 22 +++++++++++-----------
    3 files changed, 40 insertions(+), 19 deletions(-)
    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
    @@ -343,6 +343,11 @@ static void compat_irq_ack(struct irq_da
    irq_data_to_desc(data)->chip->ack(data->irq);
    }

    +static void compat_irq_mask_ack(struct irq_data *data)
    +{
    + irq_data_to_desc(data)->chip->mask_ack(data->irq);
    +}
    +
    static void compat_bus_lock(struct irq_data *data)
    {
    irq_data_to_desc(data)->chip->bus_lock(data->irq);
    @@ -386,12 +391,14 @@ void irq_chip_set_defaults(struct irq_ch
    chip->irq_unmask = compat_irq_unmask;
    if (chip->ack)
    chip->irq_ack = compat_irq_ack;
    + if (chip->mask_ack)
    + chip->irq_mask_ack = compat_irq_mask_ack;
    }

    -static inline void mask_ack_irq(struct irq_desc *desc, int irq)
    +static inline void mask_ack_irq(struct irq_desc *desc)
    {
    - if (desc->chip->mask_ack)
    - desc->chip->mask_ack(irq);
    + if (desc->chip->irq_mask_ack)
    + desc->chip->irq_mask_ack(&desc->irq_data);
    else {
    desc->chip->irq_mask(&desc->irq_data);
    if (desc->chip->irq_ack)
    @@ -514,7 +521,7 @@ handle_level_irq(unsigned int irq, struc
    irqreturn_t action_ret;

    raw_spin_lock(&desc->lock);
    - mask_ack_irq(desc, irq);
    + mask_ack_irq(desc);

    if (unlikely(desc->status & IRQ_INPROGRESS))
    goto out_unlock;
    @@ -628,7 +635,7 @@ handle_edge_irq(unsigned int irq, struct
    if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
    !desc->action)) {
    desc->status |= (IRQ_PENDING | IRQ_MASKED);
    - mask_ack_irq(desc, irq);
    + mask_ack_irq(desc);
    goto out_unlock;
    }
    kstat_incr_irqs_this_cpu(irq, desc);
    @@ -733,7 +740,7 @@ __set_irq_handler(unsigned int irq, irq_
    /* Uninstall? */
    if (handle == handle_bad_irq) {
    if (desc->chip != &no_irq_chip)
    - mask_ack_irq(desc, irq);
    + mask_ack_irq(desc);
    desc->status |= IRQ_DISABLED;
    desc->depth = 1;
    }



    \
     
     \ /
      Last update: 2010-09-27 20:11    [W:0.021 / U:2.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site