evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

regulator: wm831x-ldo: Use devm_request_threaded_irq()

Browse source 
devm guarantees that resources are freed in the oposite order to that in
which they are allocated.

Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Mark Brown 2013-08-31 11:50:00 +01:00
parent 63fb3149c8
commit 41c7a879d1
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/regulator/wm831x-ldo.c
View file

@ -288,7 +288,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev)
} }
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")); irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
ret = request_threaded_irq(irq, NULL, wm831x_ldo_uv_irq, ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
wm831x_ldo_uv_irq,
IRQF_TRIGGER_RISING, ldo->name, IRQF_TRIGGER_RISING, ldo->name,
ldo); ldo);
if (ret != 0) { if (ret != 0) {
@ -311,8 +312,6 @@ static int wm831x_gp_ldo_remove(struct platform_device *pdev)
{ {
struct wm831x_ldo *ldo = platform_get_drvdata(pdev); struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
free_irq(wm831x_irq(ldo->wm831x,
platform_get_irq_byname(pdev, "UV")), ldo);
regulator_unregister(ldo->regulator); regulator_unregister(ldo->regulator);
return 0; return 0;
@ -514,7 +513,8 @@ static int wm831x_aldo_probe(struct platform_device *pdev)
} }
irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV")); irq = wm831x_irq(wm831x, platform_get_irq_byname(pdev, "UV"));
ret = request_threaded_irq(irq, NULL, wm831x_ldo_uv_irq, ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
wm831x_ldo_uv_irq,
IRQF_TRIGGER_RISING, ldo->name, ldo); IRQF_TRIGGER_RISING, ldo->name, ldo);
if (ret != 0) { if (ret != 0) {
dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n", dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
@ -536,8 +536,6 @@ static int wm831x_aldo_remove(struct platform_device *pdev)
{ {
struct wm831x_ldo *ldo = platform_get_drvdata(pdev); struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
free_irq(wm831x_irq(ldo->wm831x, platform_get_irq_byname(pdev, "UV")),
ldo);
regulator_unregister(ldo->regulator); regulator_unregister(ldo->regulator);
return 0; return 0;