← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/mips/lasat/interrupt.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/mips/lasat/interrupt.c
32
32
static volatile int *lasat_int_mask;
33
33
static volatile int lasat_int_mask_shift;
34
34
 
35
 
void disable_lasat_irq(unsigned int irq_nr)
 
35
void disable_lasat_irq(struct irq_data *d)
36
36
{
37
 
        irq_nr -= LASAT_IRQ_BASE;
 
37
        unsigned int irq_nr = d->irq - LASAT_IRQ_BASE;
 
38
 
38
39
        *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
39
40
}
40
41
 
41
 
void enable_lasat_irq(unsigned int irq_nr)
 
42
void enable_lasat_irq(struct irq_data *d)
42
43
{
43
 
        irq_nr -= LASAT_IRQ_BASE;
 
44
        unsigned int irq_nr = d->irq - LASAT_IRQ_BASE;
 
45
 
44
46
        *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
45
47
}
46
48
 
47
49
static struct irq_chip lasat_irq_type = {
48
50
        .name = "Lasat",
49
 
        .ack = disable_lasat_irq,
50
 
        .mask = disable_lasat_irq,
51
 
        .mask_ack = disable_lasat_irq,
52
 
        .unmask = enable_lasat_irq,
 
51
        .irq_mask = disable_lasat_irq,
 
52
        .irq_unmask = enable_lasat_irq,
53
53
};
54
54
 
55
55
static inline int ls1bit32(unsigned int x)
128
128
        mips_cpu_irq_init();
129
129
 
130
130
        for (i = LASAT_IRQ_BASE; i <= LASAT_IRQ_END; i++)
131
 
                set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
 
131
                irq_set_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
132
132
 
133
133
        setup_irq(LASAT_CASCADE_IRQ, &cascade);
134
134
}