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

Commit 0d328806 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: da9055: Convert to devm_regulator_register 



Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent ea49a5eb

drivers/regulator/da9055-regulator.c

+5 −19
Original line number Diff line number Diff line
@@ -564,13 +564,13 @@ static int da9055_regulator_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	regulator->rdev = regulator_register(&regulator->info->reg_desc,

	regulator->rdev = devm_regulator_register(&pdev->dev,

						  &regulator->info->reg_desc,

						  &config);

	if (IS_ERR(regulator->rdev)) {

		dev_err(&pdev->dev, "Failed to register regulator %s\n",

			regulator->info->reg_desc.name);

		ret = PTR_ERR(regulator->rdev);

		return ret;

		return PTR_ERR(regulator->rdev);

	}



	/* Only LDO 5 and 6 has got the over current interrupt */
@@ -588,32 +588,18 @@ static int da9055_regulator_probe(struct platform_device *pdev) 
				dev_err(&pdev->dev,

				"Failed to request Regulator IRQ %d: %d\n",

				irq, ret);

				goto err_regulator;

				return ret;

			}

		}

	}



	platform_set_drvdata(pdev, regulator);



	return 0;



err_regulator:

	regulator_unregister(regulator->rdev);

	return ret;

}



static int da9055_regulator_remove(struct platform_device *pdev)

{

	struct da9055_regulator *regulator = platform_get_drvdata(pdev);



	regulator_unregister(regulator->rdev);



	return 0;

}



static struct platform_driver da9055_regulator_driver = {

	.probe = da9055_regulator_probe,

	.remove = da9055_regulator_remove,

	.driver = {

		.name = "da9055-regulator",

		.owner = THIS_MODULE,