hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas Gleixner 2015-07-13 20:44:51 +00:00 committed by Lee Jones
parent 59fa909e77
commit b79f04382e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/pm8921-core.c
View File

@ -371,14 +371,12 @@ static int pm8921_probe(struct platform_device *pdev)
if (!chip->irqdomain) if (!chip->irqdomain)
return -ENODEV; return -ENODEV;
irq_set_handler_data(irq, chip); irq_set_chained_handler_and_data(irq, pm8xxx_irq_handler, chip);
irq_set_chained_handler(irq, pm8xxx_irq_handler);
irq_set_irq_wake(irq, 1); irq_set_irq_wake(irq, 1);
rc = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); rc = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
if (rc) { if (rc) {
irq_set_chained_handler(irq, NULL); irq_set_chained_handler_and_data(irq, NULL, NULL);
irq_set_handler_data(irq, NULL);
irq_domain_remove(chip->irqdomain); 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); struct pm_irq_chip *chip = platform_get_drvdata(pdev);
device_for_each_child(&pdev->dev, NULL, pm8921_remove_child); device_for_each_child(&pdev->dev, NULL, pm8921_remove_child);
irq_set_chained_handler(irq, NULL); irq_set_chained_handler_and_data(irq, NULL, NULL);
irq_set_handler_data(irq, NULL);
irq_domain_remove(chip->irqdomain); irq_domain_remove(chip->irqdomain);
return 0; return 0;