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

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

drivers/regulator/twl-regulator.c

+1 −12
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int twlreg_probe(struct platform_device *pdev) 
	if (!initdata)

		return -EINVAL;



	info = kmemdup(template, sizeof(*info), GFP_KERNEL);

	info = devm_kmemdup(&pdev->dev, template, sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;
@@ -1192,7 +1192,6 @@ static int twlreg_probe(struct platform_device *pdev) 
	if (IS_ERR(rdev)) {

		dev_err(&pdev->dev, "can't register %s, %ld\n",

				info->desc.name, PTR_ERR(rdev));

		kfree(info);

		return PTR_ERR(rdev);

	}

	platform_set_drvdata(pdev, rdev);
@@ -1212,20 +1211,10 @@ static int twlreg_probe(struct platform_device *pdev) 
	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");



static struct platform_driver twlreg_driver = {

	.probe		= twlreg_probe,

	.remove		= twlreg_remove,

	/* NOTE: short name, to work around driver model truncation of

	 * "twl_regulator.12" (and friends) to "twl_regulator.1".

	 */