diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-31 06:56:47 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-16 19:27:54 -0400 |
commit | 14ffa8882bbd991497f2f87ce80382e5a1e6eb8f (patch) | |
tree | 980cf7b93f50643e757c7472b38527218492a8d4 | |
parent | b33e46bcdc4e598d738ed12a5a7906be4e11d786 (diff) |
regulator: arizona-ldo1: Convert to devm_regulator_register()
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/regulator/arizona-ldo1.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 81d8681c3195..4f6c2055f6b2 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c | |||
@@ -226,7 +226,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev) | |||
226 | else | 226 | else |
227 | config.init_data = &ldo1->init_data; | 227 | config.init_data = &ldo1->init_data; |
228 | 228 | ||
229 | ldo1->regulator = regulator_register(desc, &config); | 229 | ldo1->regulator = devm_regulator_register(&pdev->dev, desc, &config); |
230 | if (IS_ERR(ldo1->regulator)) { | 230 | if (IS_ERR(ldo1->regulator)) { |
231 | ret = PTR_ERR(ldo1->regulator); | 231 | ret = PTR_ERR(ldo1->regulator); |
232 | dev_err(arizona->dev, "Failed to register LDO1 supply: %d\n", | 232 | dev_err(arizona->dev, "Failed to register LDO1 supply: %d\n", |
@@ -239,18 +239,8 @@ static int arizona_ldo1_probe(struct platform_device *pdev) | |||
239 | return 0; | 239 | return 0; |
240 | } | 240 | } |
241 | 241 | ||
242 | static int arizona_ldo1_remove(struct platform_device *pdev) | ||
243 | { | ||
244 | struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev); | ||
245 | |||
246 | regulator_unregister(ldo1->regulator); | ||
247 | |||
248 | return 0; | ||
249 | } | ||
250 | |||
251 | static struct platform_driver arizona_ldo1_driver = { | 242 | static struct platform_driver arizona_ldo1_driver = { |
252 | .probe = arizona_ldo1_probe, | 243 | .probe = arizona_ldo1_probe, |
253 | .remove = arizona_ldo1_remove, | ||
254 | .driver = { | 244 | .driver = { |
255 | .name = "arizona-ldo1", | 245 | .name = "arizona-ldo1", |
256 | .owner = THIS_MODULE, | 246 | .owner = THIS_MODULE, |