source: trunk/target/linux/ramips/patches-2.6.39/950-convert-to-new-irq-functions.patch @ 27396

Last change on this file since 27396 was 27396, checked in by juhosg, 5 years ago

ramips: add 2.6.39 support

Based on the patches from #9625

File size: 1.5 KB
  • arch/mips/ralink/common/intc.c

    a b static inline u32 ramips_intc_rr(unsigne 
    4444        return __raw_readl(ramips_intc_base + reg); 
    4545} 
    4646 
    47 static void ramips_intc_irq_unmask(unsigned int irq) 
     47static void ramips_intc_irq_unmask(struct irq_data *d) 
    4848{ 
    49         irq -= ramips_intc_irq_base; 
     49        unsigned int irq = d->irq - ramips_intc_irq_base; 
     50 
    5051        ramips_intc_wr((1 << irq), INTC_REG_ENABLE); 
    5152} 
    5253 
    53 static void ramips_intc_irq_mask(unsigned int irq) 
     54static void ramips_intc_irq_mask(struct irq_data *d) 
    5455{ 
    55         irq -= ramips_intc_irq_base; 
     56        unsigned int irq = d->irq - ramips_intc_irq_base; 
     57 
    5658        ramips_intc_wr((1 << irq), INTC_REG_DISABLE); 
    5759} 
    5860 
    5961static struct irq_chip ramips_intc_irq_chip = { 
    6062        .name           = "INTC", 
    61         .unmask         = ramips_intc_irq_unmask, 
    62         .mask           = ramips_intc_irq_mask, 
    63         .mask_ack       = ramips_intc_irq_mask, 
     63        .irq_unmask     = ramips_intc_irq_unmask, 
     64        .irq_mask       = ramips_intc_irq_mask, 
     65        .irq_mask_ack   = ramips_intc_irq_mask, 
    6466}; 
    6567 
    6668static struct irqaction ramips_intc_irqaction = { 
    void __init ramips_intc_irq_init(unsigne 
    8385        ramips_intc_wr(0, INTC_REG_TYPE); 
    8486 
    8587        for (i = ramips_intc_irq_base; 
    86              i < ramips_intc_irq_base + INTC_IRQ_COUNT; i++) { 
    87                 set_irq_chip_and_handler(i, &ramips_intc_irq_chip, 
     88             i < ramips_intc_irq_base + INTC_IRQ_COUNT; i++) 
     89                irq_set_chip_and_handler(i, &ramips_intc_irq_chip, 
    8890                                         handle_level_irq); 
    89         } 
    9091 
    9192        setup_irq(irq, &ramips_intc_irqaction); 
    9293        ramips_intc_wr(INTC_INT_GLOBAL, INTC_REG_ENABLE); 
Note: See TracBrowser for help on using the repository browser.