From: Mark Brown Date: Sat, 31 Aug 2013 11:00:57 +0000 (+0100) Subject: regulator: wm8400: Convert to devm_regulator_register() X-Git-Tag: v3.13-rc1~124^2~23^2~44 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb8b3c8360408b78ca99492f8c1fec080c75dd71;p=profile%2Fivi%2Fkernel-x86-ivi.git regulator: wm8400: Convert to devm_regulator_register() Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c index 58f51be..870b52f 100644 --- a/drivers/regulator/wm8400-regulator.c +++ b/drivers/regulator/wm8400-regulator.c @@ -219,7 +219,8 @@ static int wm8400_regulator_probe(struct platform_device *pdev) config.driver_data = wm8400; config.regmap = wm8400->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); @@ -228,21 +229,11 @@ static int wm8400_regulator_probe(struct platform_device *pdev) return 0; } -static int wm8400_regulator_remove(struct platform_device *pdev) -{ - struct regulator_dev *rdev = platform_get_drvdata(pdev); - - regulator_unregister(rdev); - - return 0; -} - static struct platform_driver wm8400_regulator_driver = { .driver = { .name = "wm8400-regulator", }, .probe = wm8400_regulator_probe, - .remove = wm8400_regulator_remove, }; /**