Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05379818 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

gpio/mpc8xxx: 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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarThomas 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
parent 01e2d062

drivers/gpio/gpio-mpc8xxx.c

+3 −4
Original line number Diff line number Diff line
@@ -396,8 +396,8 @@ static int mpc8xxx_probe(struct platform_device *pdev) 
	out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);

	out_be32(mm_gc->regs + GPIO_IMR, 0);



	irq_set_handler_data(mpc8xxx_gc->irqn, mpc8xxx_gc);

	irq_set_chained_handler(mpc8xxx_gc->irqn, mpc8xxx_gpio_irq_cascade);

	irq_set_chained_handler_and_data(mpc8xxx_gc->irqn,

					 mpc8xxx_gpio_irq_cascade, mpc8xxx_gc);



	return 0;

}
@@ -407,8 +407,7 @@ static int mpc8xxx_remove(struct platform_device *pdev) 
	struct mpc8xxx_gpio_chip *mpc8xxx_gc = platform_get_drvdata(pdev);



	if (mpc8xxx_gc->irq) {

		irq_set_handler_data(mpc8xxx_gc->irqn, NULL);

		irq_set_chained_handler(mpc8xxx_gc->irqn, NULL);

		irq_set_chained_handler_and_data(mpc8xxx_gc->irqn, NULL, NULL);

		irq_domain_remove(mpc8xxx_gc->irq);

	}