diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 20:44:51 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-08-11 15:09:04 +0100 |
| commit | b79f04382e265cd6e927977581d2fddb53ef916a (patch) | |
| tree | 2d6996fa8a7f38eaad0c1ba1ca0fad1ca081f90b /drivers/mfd/pm8921-core.c | |
| parent | 59fa909e774d80c20cf69e98fd2ba76bcc0f3fbc (diff) | |
mfd: pm8921: 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.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/pm8921-core.c')
| -rw-r--r-- | drivers/mfd/pm8921-core.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c index 24396d71a262..59502d02cd15 100644 --- a/drivers/mfd/pm8921-core.c +++ b/drivers/mfd/pm8921-core.c @@ -371,14 +371,12 @@ static int pm8921_probe(struct platform_device *pdev) 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); } @@ -397,8 +395,7 @@ static int pm8921_remove(struct platform_device *pdev) 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; |