Commit cd01e32d authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

regulator: twl: Convert to use devm_kmemdup()

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7171511e
...@@ -1128,7 +1128,7 @@ static int twlreg_probe(struct platform_device *pdev) ...@@ -1128,7 +1128,7 @@ static int twlreg_probe(struct platform_device *pdev)
if (!initdata) if (!initdata)
return -EINVAL; return -EINVAL;
info = kmemdup(template, sizeof(*info), GFP_KERNEL); info = devm_kmemdup(&pdev->dev, template, sizeof(*info), GFP_KERNEL);
if (!info) if (!info)
return -ENOMEM; return -ENOMEM;
...@@ -1192,7 +1192,6 @@ static int twlreg_probe(struct platform_device *pdev) ...@@ -1192,7 +1192,6 @@ static int twlreg_probe(struct platform_device *pdev)
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(&pdev->dev, "can't register %s, %ld\n", dev_err(&pdev->dev, "can't register %s, %ld\n",
info->desc.name, PTR_ERR(rdev)); info->desc.name, PTR_ERR(rdev));
kfree(info);
return PTR_ERR(rdev); return PTR_ERR(rdev);
} }
platform_set_drvdata(pdev, rdev); platform_set_drvdata(pdev, rdev);
...@@ -1212,20 +1211,10 @@ static int twlreg_probe(struct platform_device *pdev) ...@@ -1212,20 +1211,10 @@ static int twlreg_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int twlreg_remove(struct platform_device *pdev)
{
struct regulator_dev *rdev = platform_get_drvdata(pdev);
struct twlreg_info *info = rdev->reg_data;
kfree(info);
return 0;
}
MODULE_ALIAS("platform:twl_reg"); MODULE_ALIAS("platform:twl_reg");
static struct platform_driver twlreg_driver = { static struct platform_driver twlreg_driver = {
.probe = twlreg_probe, .probe = twlreg_probe,
.remove = twlreg_remove,
/* NOTE: short name, to work around driver model truncation of /* NOTE: short name, to work around driver model truncation of
* "twl_regulator.12" (and friends) to "twl_regulator.1". * "twl_regulator.12" (and friends) to "twl_regulator.1".
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment