提交 41c7a879 编写于 作者: M Mark Brown

regulator: wm831x-ldo: Use devm_request_threaded_irq()

devm guarantees that resources are freed in the oposite order to that in
which they are allocated.
Signed-off-by: NMark Brown <broonie@linaro.org>
上级 63fb3149
...@@ -288,9 +288,10 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev) ...@@ -288,9 +288,10 @@ 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,
IRQF_TRIGGER_RISING, ldo->name, wm831x_ldo_uv_irq,
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",
irq, ret); irq, ret);
...@@ -311,8 +312,6 @@ static int wm831x_gp_ldo_remove(struct platform_device *pdev) ...@@ -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,8 +513,9 @@ static int wm831x_aldo_probe(struct platform_device *pdev) ...@@ -514,8 +513,9 @@ 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,
IRQF_TRIGGER_RISING, ldo->name, ldo); wm831x_ldo_uv_irq,
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",
irq, ret); irq, ret);
...@@ -536,8 +536,6 @@ static int wm831x_aldo_remove(struct platform_device *pdev) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册