diff options
| author |   NeilBrown <neilb@suse.de> | 2015-03-23 10:20:28 +1100 |
|---|---|---|
| committer |   Sebastian Reichel <sre@kernel.org> | 2015-07-24 15:53:13 +0200 |
| commit | 1b7cac23419e1398eac4c28368da6671c9c4ce9d (patch) | |
| tree | a13cd1a8e2ee84726c6f22ebbb3f419241120033 /drivers/power | |
| parent | power: reset: at91: add sama5d3 reset function (diff) | |
| download | linux-dev-1b7cac23419e1398eac4c28368da6671c9c4ce9d.tar.xz linux-dev-1b7cac23419e1398eac4c28368da6671c9c4ce9d.zip | |
twl4030_charger: use devm_request_threaded_irq
This simplifies the error paths.
Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/twl4030_charger.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index 022b8910e443..4c779aecd86b 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -619,21 +619,21 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) goto fail_register_usb; } - ret = request_threaded_irq(bci->irq_chg, NULL, + ret = devm_request_threaded_irq(&pdev->dev, bci->irq_chg, NULL, twl4030_charger_interrupt, IRQF_ONESHOT, pdev->name, bci); if (ret < 0) { dev_err(&pdev->dev, "could not request irq %d, status %d\n", bci->irq_chg, ret); - goto fail_chg_irq; + goto fail; } - ret = request_threaded_irq(bci->irq_bci, NULL, + ret = devm_request_threaded_irq(&pdev->dev, bci->irq_bci, NULL, twl4030_bci_interrupt, IRQF_ONESHOT, pdev->name, bci); if (ret < 0) { dev_err(&pdev->dev, "could not request irq %d, status %d\n", bci->irq_bci, ret); - goto fail_bci_irq; + goto fail; } INIT_WORK(&bci->work, twl4030_bci_usb_work); @@ -656,7 +656,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) TWL4030_INTERRUPTS_BCIIMR1A); if (ret < 0) { dev_err(&pdev->dev, "failed to unmask interrupts: %d\n", ret); - goto fail_unmask_interrupts; + goto fail; } reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV); @@ -675,11 +675,7 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) return 0; -fail_unmask_interrupts: - free_irq(bci->irq_bci, bci); -fail_bci_irq: - free_irq(bci->irq_chg, bci); -fail_chg_irq: +fail: power_supply_unregister(bci->usb); fail_register_usb: power_supply_unregister(bci->ac); @@ -704,8 +700,6 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev) twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, TWL4030_INTERRUPTS_BCIIMR2A); - free_irq(bci->irq_bci, bci); - free_irq(bci->irq_chg, bci); power_supply_unregister(bci->usb); power_supply_unregister(bci->ac); kfree(bci); |