summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMartin Kaiser <martin@kaiser.cx>2017-10-18 18:32:47 +0200
committerLinus Walleij <linus.walleij@linaro.org>2017-10-19 22:32:41 +0200
commit5048f0aefb96fe3fd468002c879d7a5918336b1f (patch)
tree47e24f4f7e70fa15cf47e6c9cc1dbfb55d996db7 /drivers
parent3ee9e605caea401b060a1f9f81343b8bd0952fbd (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpiolib.c4
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 */