diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 11:12:31 +0000 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-27 00:09:49 +0100 |
| commit | c22435a307e00b8ae947b79a8c0d94ab0bef404c (patch) | |
| tree | f54ef88fc71bbc3e94412f7b01b8a7db61a61d9a /drivers/mfd | |
| parent | d740f4523bb4aea24bece704c726c69094e20d00 (diff) | |
| download | linux-stable-c22435a307e00b8ae947b79a8c0d94ab0bef404c.tar.gz linux-stable-c22435a307e00b8ae947b79a8c0d94ab0bef404c.tar.bz2 linux-stable-c22435a307e00b8ae947b79a8c0d94ab0bef404c.zip | |
mfd: twl6030: Cleanup interrupt handling
irq_desc checking in the interrupt demux routine is totally
pointless. The driver sets those lines up, so that cant go away
magically.
Remove the open coded handler magic and use the proper accessor.
This driver needs to be converted to threaded interrupts and buslock.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl6030-irq.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c index 4082ed73613f..3b9c7756cb6d 100644 --- a/drivers/mfd/twl6030-irq.c +++ b/drivers/mfd/twl6030-irq.c @@ -140,22 +140,7 @@ static int twl6030_irq_thread(void *data) if (sts.int_sts & 0x1) { int module_irq = twl6030_irq_base + twl6030_interrupt_mapping[i]; - struct irq_desc *d = irq_to_desc(module_irq); - - if (!d) { - pr_err("twl6030: Invalid SIH IRQ: %d\n", - module_irq); - return -EINVAL; - } - - /* These can't be masked ... always warn - * if we get any surprises. - */ - if (d->status & IRQ_DISABLED) - note_interrupt(module_irq, d, - IRQ_NONE); - else - d->handle_irq(module_irq, d); + generic_handle_irq(module_irq); } local_irq_enable(); |