Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

regulator: as3711: Convert to devm_regulator_register 



Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9b2cdac7

drivers/regulator/as3711-regulator.c

+2 −20
Original line number Diff line number Diff line
@@ -273,33 +273,16 @@ static int as3711_regulator_probe(struct platform_device *pdev) 
		config.regmap = as3711->regmap;

		config.of_node = of_node[id];



		rdev = regulator_register(&ri->desc, &config);

		rdev = devm_regulator_register(&pdev->dev, &ri->desc, &config);

		if (IS_ERR(rdev)) {

			dev_err(&pdev->dev, "Failed to register regulator %s\n",

				ri->desc.name);

			ret = PTR_ERR(rdev);

			goto eregreg;

			return PTR_ERR(rdev);

		}

		reg->rdev = rdev;

	}

	platform_set_drvdata(pdev, regs);

	return 0;



eregreg:

	while (--id >= 0)

		regulator_unregister(regs[id].rdev);



	return ret;

}



static int as3711_regulator_remove(struct platform_device *pdev)

{

	struct as3711_regulator *regs = platform_get_drvdata(pdev);

	int id;



	for (id = 0; id < AS3711_REGULATOR_NUM; ++id)

		regulator_unregister(regs[id].rdev);

	return 0;

}



static struct platform_driver as3711_regulator_driver = {
@@ -308,7 +291,6 @@ static struct platform_driver as3711_regulator_driver = { 
		.owner	= THIS_MODULE,

	},

	.probe		= as3711_regulator_probe,

	.remove		= as3711_regulator_remove,

};



static int __init as3711_regulator_init(void)