Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: twl: Convert to use devm_kmemdup()

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

authored by

Axel Lin and committed by
Mark Brown
cd01e32d 7171511e

+1 -12
+1 -12
drivers/regulator/twl-regulator.c
··· 1128 1128 if (!initdata) 1129 1129 return -EINVAL; 1130 1130 1131 - info = kmemdup(template, sizeof(*info), GFP_KERNEL); 1131 + info = devm_kmemdup(&pdev->dev, template, sizeof(*info), GFP_KERNEL); 1132 1132 if (!info) 1133 1133 return -ENOMEM; 1134 1134 ··· 1192 1192 if (IS_ERR(rdev)) { 1193 1193 dev_err(&pdev->dev, "can't register %s, %ld\n", 1194 1194 info->desc.name, PTR_ERR(rdev)); 1195 - kfree(info); 1196 1195 return PTR_ERR(rdev); 1197 1196 } 1198 1197 platform_set_drvdata(pdev, rdev); ··· 1211 1212 return 0; 1212 1213 } 1213 1214 1214 - static int twlreg_remove(struct platform_device *pdev) 1215 - { 1216 - struct regulator_dev *rdev = platform_get_drvdata(pdev); 1217 - struct twlreg_info *info = rdev->reg_data; 1218 - 1219 - kfree(info); 1220 - return 0; 1221 - } 1222 - 1223 1215 MODULE_ALIAS("platform:twl_reg"); 1224 1216 1225 1217 static struct platform_driver twlreg_driver = { 1226 1218 .probe = twlreg_probe, 1227 - .remove = twlreg_remove, 1228 1219 /* NOTE: short name, to work around driver model truncation of 1229 1220 * "twl_regulator.12" (and friends) to "twl_regulator.1". 1230 1221 */