diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 20:44:47 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-08-11 15:09:02 +0100 |
| commit | 073f7f99a0054a3af6ecef1d0ce12aab9c800460 (patch) | |
| tree | 1bb50c0cd22953a4b9cf8a176503419ceda466e9 /drivers/mfd/htc-egpio.c | |
| parent | c89fc9ac88ad99c0e629204d1b62af57367fd32d (diff) | |
| download | linux-073f7f99a0054a3af6ecef1d0ce12aab9c800460.tar.gz linux-073f7f99a0054a3af6ecef1d0ce12aab9c800460.tar.bz2 linux-073f7f99a0054a3af6ecef1d0ce12aab9c800460.zip | |
mfd: htc-egpio: 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/htc-egpio.c')
| -rw-r--r-- | drivers/mfd/htc-egpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c index c9d5e3fb4fd1..9131cdcdc64a 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c @@ -353,8 +353,8 @@ static int __init egpio_probe(struct platform_device *pdev) irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE); } irq_set_irq_type(ei->chained_irq, IRQ_TYPE_EDGE_RISING); - irq_set_handler_data(ei->chained_irq, ei); - irq_set_chained_handler(ei->chained_irq, egpio_handler); + irq_set_chained_handler_and_data(ei->chained_irq, + egpio_handler, ei); ack_irqs(ei); device_init_wakeup(&pdev->dev, 1); |