diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 20:44:52 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-08-11 15:09:04 +0100 |
| commit | de7c9e0da9ca5962ed562296eaa521e5cc492322 (patch) | |
| tree | 72bd06442047993e2a0a4df2a890babe8c27605c /drivers/mfd/t7l66xb.c | |
| parent | b79f04382e265cd6e927977581d2fddb53ef916a (diff) | |
mfd: t7l66xb: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. We now have
a function to set both under irq_desc->lock. Replace the two calls
with one.
Search and conversion was done with coccinelle.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/t7l66xb.c')
| -rw-r--r-- | drivers/mfd/t7l66xb.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 96d82980ead4..cc28103222c0 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c @@ -249,8 +249,7 @@ static void t7l66xb_attach_irq(struct platform_device *dev) } irq_set_irq_type(t7l66xb->irq, IRQ_TYPE_EDGE_FALLING); - irq_set_handler_data(t7l66xb->irq, t7l66xb); - irq_set_chained_handler(t7l66xb->irq, t7l66xb_irq); + irq_set_chained_handler_and_data(t7l66xb->irq, t7l66xb_irq, t7l66xb); } static void t7l66xb_detach_irq(struct platform_device *dev) @@ -260,8 +259,7 @@ static void t7l66xb_detach_irq(struct platform_device *dev) irq_base = t7l66xb->irq_base; - irq_set_chained_handler(t7l66xb->irq, NULL); - irq_set_handler_data(t7l66xb->irq, NULL); + irq_set_chained_handler_and_data(t7l66xb->irq, NULL, NULL); for (irq = irq_base; irq < irq_base + T7L66XB_NR_IRQS; irq++) { irq_set_chip(irq, NULL); |