← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/mfd/tc3589x.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/tc3589x.c
192
192
        int irq;
193
193
 
194
194
        for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
195
 
                set_irq_chip_data(irq, tc3589x);
196
 
                set_irq_chip_and_handler(irq, &dummy_irq_chip,
 
195
                irq_set_chip_data(irq, tc3589x);
 
196
                irq_set_chip_and_handler(irq, &dummy_irq_chip,
197
197
                                         handle_edge_irq);
198
 
                set_irq_nested_thread(irq, 1);
 
198
                irq_set_nested_thread(irq, 1);
199
199
#ifdef CONFIG_ARM
200
200
                set_irq_flags(irq, IRQF_VALID);
201
201
#else
202
 
                set_irq_noprobe(irq);
 
202
                irq_set_noprobe(irq);
203
203
#endif
204
204
        }
205
205
 
215
215
#ifdef CONFIG_ARM
216
216
                set_irq_flags(irq, 0);
217
217
#endif
218
 
                set_irq_chip_and_handler(irq, NULL, NULL);
219
 
                set_irq_chip_data(irq, NULL);
 
218
                irq_set_chip_and_handler(irq, NULL, NULL);
 
219
                irq_set_chip_data(irq, NULL);
220
220
        }
221
221
}
222
222