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

Commit 8986cf88 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

regulator: db8500-prcmu: Separate regulator registration from probe 



This will provide us with a convenient way to register regulators when
booting with Device Tree both enabled & disabled and will save us a
great deal of code duplication in time.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b13296d0

drivers/regulator/db8500-prcmu.c

+44 −27
Original line number Diff line number Diff line
@@ -410,25 +410,23 @@ dbx500_regulator_info[DB8500_NUM_REGULATORS] = { 
	},

};



static int __devinit db8500_regulator_probe(struct platform_device *pdev)

static __devinit int db8500_regulator_register(struct platform_device *pdev,

					struct regulator_init_data *init_data,

					int id,

					struct device_node *np)

{

	struct regulator_init_data *db8500_init_data =

					dev_get_platdata(&pdev->dev);

	struct regulator_config config = { };

	int i, err;



	/* register all regulators */

	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {

	struct dbx500_regulator_info *info;

		struct regulator_init_data *init_data = &db8500_init_data[i];

	struct regulator_config config = { };

	int err;



	/* assign per-regulator data */

		info = &dbx500_regulator_info[i];

	info = &dbx500_regulator_info[id];

	info->dev = &pdev->dev;



	config.dev = &pdev->dev;

	config.init_data = init_data;

	config.driver_data = info;

	config.of_node = np;



	/* register with the regulator framework */

	info->rdev = regulator_register(&info->desc, &config);
@@ -438,8 +436,8 @@ static int __devinit db8500_regulator_probe(struct platform_device *pdev) 
			info->desc.name, err);



		/* if failing, unregister all earlier regulators */

			while (--i >= 0) {

				info = &dbx500_regulator_info[i];

		while (--id >= 0) {

			info = &dbx500_regulator_info[id];

			regulator_unregister(info->rdev);

		}

		return err;
@@ -447,12 +445,31 @@ static int __devinit db8500_regulator_probe(struct platform_device *pdev) 


	dev_dbg(rdev_get_dev(info->rdev),

		"regulator-%s-probed\n", info->desc.name);



	return 0;

}



static int __devinit db8500_regulator_probe(struct platform_device *pdev)

{

	struct regulator_init_data *db8500_init_data =

					dev_get_platdata(&pdev->dev);

	int i, err;



	/* register all regulators */

	for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) {

		err = db8500_regulator_register(pdev,

						&db8500_init_data[i],

						i, NULL);

		if (err)

			return err;



		dev_dbg(rdev_get_dev(info->rdev),

			"regulator-%s-probed\n", info->desc.name);

	}

	err = ux500_regulator_debug_init(pdev,

					 dbx500_regulator_info,

					 ARRAY_SIZE(dbx500_regulator_info));



	return err;

	return 0;

}



static int __exit db8500_regulator_remove(struct platform_device *pdev)