Messages in this thread | | | Date | Tue, 28 Jul 2015 09:05:13 +0100 | From | Lee Jones <> | Subject | Re: [patch 4/9] mfd/pm8921: Consolidate chained IRQ handler install/remove |
| |
On Mon, 13 Jul 2015, Thomas Gleixner wrote:
> 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. > > 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: Samuel Ortiz <sameo@linux.intel.com> > Cc: Lee Jones <lee.jones@linaro.org> > --- > drivers/mfd/pm8921-core.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-)
Applied, thanks.
> Index: tip/drivers/mfd/pm8921-core.c > =================================================================== > --- tip.orig/drivers/mfd/pm8921-core.c > +++ tip/drivers/mfd/pm8921-core.c > @@ -336,14 +336,12 @@ static int pm8921_probe(struct platform_ > if (!chip->irqdomain) > return -ENODEV; > > - irq_set_handler_data(irq, chip); > - irq_set_chained_handler(irq, pm8xxx_irq_handler); > + irq_set_chained_handler_and_data(irq, pm8xxx_irq_handler, chip); > irq_set_irq_wake(irq, 1); > > rc = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); > if (rc) { > - irq_set_chained_handler(irq, NULL); > - irq_set_handler_data(irq, NULL); > + irq_set_chained_handler_and_data(irq, NULL, NULL); > irq_domain_remove(chip->irqdomain); > } > > @@ -362,8 +360,7 @@ static int pm8921_remove(struct platform > struct pm_irq_chip *chip = platform_get_drvdata(pdev); > > device_for_each_child(&pdev->dev, NULL, pm8921_remove_child); > - irq_set_chained_handler(irq, NULL); > - irq_set_handler_data(irq, NULL); > + irq_set_chained_handler_and_data(irq, NULL, NULL); > irq_domain_remove(chip->irqdomain); > > return 0; > >
-- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
| |