← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/mfd/wm8994-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:
drivers/mfd/wm8994-irq.c
278
278
        for (cur_irq = wm8994->irq_base;
279
279
             cur_irq < ARRAY_SIZE(wm8994_irqs) + wm8994->irq_base;
280
280
             cur_irq++) {
281
 
                set_irq_chip_data(cur_irq, wm8994);
282
 
                set_irq_chip_and_handler(cur_irq, &wm8994_irq_chip,
 
281
                irq_set_chip_data(cur_irq, wm8994);
 
282
                irq_set_chip_and_handler(cur_irq, &wm8994_irq_chip,
283
283
                                         handle_edge_irq);
284
 
                set_irq_nested_thread(cur_irq, 1);
 
284
                irq_set_nested_thread(cur_irq, 1);
285
285
 
286
286
                /* ARM needs us to explicitly flag the IRQ as valid
287
287
                 * and will set them noprobe when we do so. */
288
288
#ifdef CONFIG_ARM
289
289
                set_irq_flags(cur_irq, IRQF_VALID);
290
290
#else
291
 
                set_irq_noprobe(cur_irq);
 
291
                irq_set_noprobe(cur_irq);
292
292
#endif
293
293
        }
294
294