gpio/tz1090: 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>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: linux-gpio@vger.kernel.org

diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c
index 445660adc898918d8c32cb9b09816762157dfc2c..bbac92ae4c328ab96eef76785e4189e7b3de08a5 100644 (file)
--- a/drivers/gpio/gpio-tz1090.c
+++ b/drivers/gpio/gpio-tz1090.c
@@ -510,8 +510,8 @@ static int tz1090_gpio_bank_probe(struct tz1090_gpio_bank_info *info)
        gc->chip_types[1].chip.flags            = IRQCHIP_MASK_ON_SUSPEND;
 
        /* Setup chained handler for this GPIO bank */
-       irq_set_handler_data(bank->irq, bank);
-       irq_set_chained_handler(bank->irq, tz1090_gpio_irq_handler);
+       irq_set_chained_handler_and_data(bank->irq, tz1090_gpio_irq_handler,
+                                        bank);
 
        return 0;
 }