lkml.org 
[lkml]   [2011]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 2/4] avr32: at32ap: Convert intc irq_chip to new functions
    Also replace the open coded handler call with the proper wrapper.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    arch/avr32/mach-at32ap/intc.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    Index: linux-next/arch/avr32/mach-at32ap/intc.c
    ===================================================================
    --- linux-next.orig/arch/avr32/mach-at32ap/intc.c
    +++ linux-next/arch/avr32/mach-at32ap/intc.c
    @@ -34,12 +34,12 @@ extern struct platform_device at32_intc0
    * TODO: We may be able to implement mask/unmask by setting IxM flags
    * in the status register.
    */
    -static void intc_mask_irq(unsigned int irq)
    +static void intc_mask_irq(struct irq_data *d)
    {

    }

    -static void intc_unmask_irq(unsigned int irq)
    +static void intc_unmask_irq(struct irq_data *d)
    {

    }
    @@ -47,8 +47,8 @@ static void intc_unmask_irq(unsigned int
    static struct intc intc0 = {
    .chip = {
    .name = "intc",
    - .mask = intc_mask_irq,
    - .unmask = intc_unmask_irq,
    + .irq_mask = intc_mask_irq,
    + .irq_unmask = intc_unmask_irq,
    },
    };

    @@ -57,7 +57,6 @@ static struct intc intc0 = {
    */
    asmlinkage void do_IRQ(int level, struct pt_regs *regs)
    {
    - struct irq_desc *desc;
    struct pt_regs *old_regs;
    unsigned int irq;
    unsigned long status_reg;
    @@ -69,8 +68,7 @@ asmlinkage void do_IRQ(int level, struct
    irq_enter();

    irq = intc_readl(&intc0, INTCAUSE0 - 4 * level);
    - desc = irq_desc + irq;
    - desc->handle_irq(irq, desc);
    + generic_handle_irq(irq);

    /*
    * Clear all interrupt level masks so that we may handle



    \
     
     \ /
      Last update: 2011-02-06 17:33    [W:0.020 / U:32.080 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site