Commit 5048f0ae authored by Martin Kaiser's avatar Martin Kaiser Committed by Linus Walleij
Browse files

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: default avatarMartin Kaiser <martin@kaiser.cx>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 3ee9e605

drivers/gpio/gpiolib.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1724,8 +1724,8 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip) 
	acpi_gpiochip_free_interrupts(gpiochip);

	acpi_gpiochip_free_interrupts(gpiochip);





	if (gpiochip->irq_chained_parent) {

	if (gpiochip->irq_chained_parent) {

		irq_set_chained_handler(gpiochip->irq_chained_parent, NULL);

		irq_set_chained_handler_and_data(

		irq_set_handler_data(gpiochip->irq_chained_parent, NULL);

			gpiochip->irq_chained_parent, NULL, NULL);

	}

	}





	/* Remove all IRQ mappings and delete the domain */

	/* Remove all IRQ mappings and delete the domain */