← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/plat-versatile/fpga-irq.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/arm/plat-versatile/fpga-irq.c
30
30
 
31
31
static void fpga_irq_handle(unsigned int irq, struct irq_desc *desc)
32
32
{
33
 
        struct fpga_irq_data *f = get_irq_desc_data(desc);
 
33
        struct fpga_irq_data *f = irq_desc_get_handler_data(desc);
34
34
        u32 status = readl(f->base + IRQ_STATUS);
35
35
 
36
36
        if (status == 0) {
55
55
        f->chip.irq_unmask = fpga_irq_unmask;
56
56
 
57
57
        if (parent_irq != -1) {
58
 
                set_irq_data(parent_irq, f);
59
 
                set_irq_chained_handler(parent_irq, fpga_irq_handle);
 
58
                irq_set_handler_data(parent_irq, f);
 
59
                irq_set_chained_handler(parent_irq, fpga_irq_handle);
60
60
        }
61
61
 
62
62
        for (i = 0; i < 32; i++) {
63
63
                if (valid & (1 << i)) {
64
64
                        unsigned int irq = f->irq_start + i;
65
65
 
66
 
                        set_irq_chip_data(irq, f);
67
 
                        set_irq_chip(irq, &f->chip);
68
 
                        set_irq_handler(irq, handle_level_irq);
 
66
                        irq_set_chip_data(irq, f);
 
67
                        irq_set_chip_and_handler(irq, &f->chip,
 
68
                                                 handle_level_irq);
69
69
                        set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
70
70
                }
71
71
        }