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 16/19] genirq; Provide compat handling for chip->retrigger()
    Wrap the old chip function retrigger() until the migration is complete
    and the old chip functions are removed.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    kernel/irq/chip.c | 7 +++++++
    kernel/irq/resend.c | 3 ++-
    2 files changed, 9 insertions(+), 1 deletion(-)

    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
    @@ -389,6 +389,11 @@ static int compat_irq_set_wake(struct ir
    return irq_data_to_desc(data)->chip->set_wake(data->irq, on);
    }

    +static int compat_irq_retrigger(struct irq_data *data)
    +{
    + return irq_data_to_desc(data)->chip->retrigger(data->irq);
    +}
    +
    static void compat_bus_lock(struct irq_data *data)
    {
    irq_data_to_desc(data)->chip->bus_lock(data->irq);
    @@ -461,6 +466,8 @@ void irq_chip_set_defaults(struct irq_ch
    chip->irq_set_type = compat_irq_set_type;
    if (chip->set_wake)
    chip->irq_set_wake = compat_irq_set_wake;
    + if (chip->retrigger)
    + chip->irq_retrigger = compat_irq_retrigger;
    }

    static inline void mask_ack_irq(struct irq_desc *desc)
    Index: linux-2.6-tip/kernel/irq/resend.c
    ===================================================================
    --- linux-2.6-tip.orig/kernel/irq/resend.c
    +++ linux-2.6-tip/kernel/irq/resend.c
    @@ -70,7 +70,8 @@ void check_irq_resend(struct irq_desc *d
    if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
    desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;

    - if (!desc->chip->retrigger || !desc->chip->retrigger(irq)) {
    + if (!desc->chip->irq_retrigger ||
    + !desc->chip->irq_retrigger(&desc->irq_data)) {
    #ifdef CONFIG_HARDIRQS_SW_RESEND
    /* Set it pending and activate the softirq: */
    set_bit(irq, irqs_resend);



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