gpiolib: clear irq handler and data in one go

Replace the two separate calls for clearing the irqchip's chained handler
and its data with a single irq_set_chained_handler_and_data() call.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 5acff8db5136..e7372093d968 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1724,8 +1724,8 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
         acpi_gpiochip_free_interrupts(gpiochip);
 
         if (gpiochip->irq_chained_parent) {
-                irq_set_chained_handler(gpiochip->irq_chained_parent, NULL);
-                irq_set_handler_data(gpiochip->irq_chained_parent, NULL);
+                irq_set_chained_handler_and_data(
+                        gpiochip->irq_chained_parent, NULL, NULL);
         }
 
         /* Remove all IRQ mappings and delete the domain */