Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c7a879 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@linaro.org>
parent 63fb3149

drivers/regulator/wm831x-ldo.c

+7 −9
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ static int wm831x_gp_ldo_probe(struct platform_device *pdev) 
	}



	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);

	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);



	free_irq(wm831x_irq(ldo->wm831x,

			    platform_get_irq_byname(pdev, "UV")), ldo);

	regulator_unregister(ldo->regulator);



	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"));

	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);

	if (ret != 0) {

		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);



	free_irq(wm831x_irq(ldo->wm831x, platform_get_irq_byname(pdev, "UV")),

		 ldo);

	regulator_unregister(ldo->regulator);



	return 0;