diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-31 12:00:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-17 00:27:55 +0100 |
| commit | e57e54693371fe1530f376c8a67c33d19bb2a0dc (patch) | |
| tree | e4f7382cbc44c4463eacc600a48ab564b414f053 /drivers/regulator/wm8350-regulator.c | |
| parent | fc7c60e390c9b99b28d078c27360cb6cd688cfd3 (diff) | |
| download | talos-obmc-linux-e57e54693371fe1530f376c8a67c33d19bb2a0dc.tar.gz talos-obmc-linux-e57e54693371fe1530f376c8a67c33d19bb2a0dc.zip | |
regulator: wm8350: Convert to devm_regulator_register()
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/wm8350-regulator.c')
| -rw-r--r-- | drivers/regulator/wm8350-regulator.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 835b5f0f344e..a438e937cfa0 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c @@ -1206,7 +1206,8 @@ static int wm8350_regulator_probe(struct platform_device *pdev) config.regmap = wm8350->regmap; /* register regulator */ - rdev = regulator_register(&wm8350_reg[pdev->id], &config); + rdev = devm_regulator_register(&pdev->dev, &wm8350_reg[pdev->id], + &config); if (IS_ERR(rdev)) { dev_err(&pdev->dev, "failed to register %s\n", wm8350_reg[pdev->id].name); @@ -1217,7 +1218,6 @@ static int wm8350_regulator_probe(struct platform_device *pdev) ret = wm8350_register_irq(wm8350, wm8350_reg[pdev->id].irq, pmic_uv_handler, 0, "UV", rdev); if (ret < 0) { - regulator_unregister(rdev); dev_err(&pdev->dev, "failed to register regulator %s IRQ\n", wm8350_reg[pdev->id].name); return ret; @@ -1233,8 +1233,6 @@ static int wm8350_regulator_remove(struct platform_device *pdev) wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq, rdev); - regulator_unregister(rdev); - return 0; } |
