diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:11:35 +0100 |
| commit | b735e47f6e94f07911dcdf92837ebfd0ec1cf7c0 (patch) | |
| tree | 12b9d1bf32084db43b7c1060c59410c194786dfb /drivers/regulator/pcf50633-regulator.c | |
| parent | 3242a86170070a332037bff65ab5872189e20791 (diff) | |
| parent | 5e0855759ca621bba454747fc1b5b76a7290f50f (diff) | |
Merge remote-tracking branch 'regulator/topic/devm' into regulator-next
Diffstat (limited to 'drivers/regulator/pcf50633-regulator.c')
| -rw-r--r-- | drivers/regulator/pcf50633-regulator.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index 0f3576d48abf..d7da1c15a6da 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c @@ -90,7 +90,8 @@ static int pcf50633_regulator_probe(struct platform_device *pdev) config.driver_data = pcf; config.regmap = pcf->regmap; - rdev = regulator_register(®ulators[pdev->id], &config); + rdev = devm_regulator_register(&pdev->dev, ®ulators[pdev->id], + &config); if (IS_ERR(rdev)) return PTR_ERR(rdev); @@ -102,21 +103,11 @@ static int pcf50633_regulator_probe(struct platform_device *pdev) return 0; } -static int pcf50633_regulator_remove(struct platform_device *pdev) -{ - struct regulator_dev *rdev = platform_get_drvdata(pdev); - - regulator_unregister(rdev); - - return 0; -} - static struct platform_driver pcf50633_regulator_driver = { .driver = { .name = "pcf50633-regltr", }, .probe = pcf50633_regulator_probe, - .remove = pcf50633_regulator_remove, }; static int __init pcf50633_regulator_init(void) |