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

regulator: Fix build error for mc13783 and mc13892 



Convert mc13783 and mc13892 to use a struct to pass in regulator runtime
configuration.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fe53d18d

drivers/regulator/mc13783-regulator.c

+9 −3
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) 
	struct mc13xxx_regulator_platform_data *pdata =

		dev_get_platdata(&pdev->dev);

	struct mc13xxx_regulator_init_data *init_data;

	struct regulator_config config = { };

	int i, ret;



	dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id);
@@ -357,11 +358,16 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev) 
	priv->mc13xxx = mc13783;



	for (i = 0; i < pdata->num_regulators; i++) {

		struct regulator_desc *desc;



		init_data = &pdata->regulators[i];

		priv->regulators[i] = regulator_register(

				&mc13783_regulators[init_data->id].desc,

				&pdev->dev, init_data->init_data, priv, NULL);

		desc = &mc13783_regulators[init_data->id].desc;



		config.dev = &pdev->dev;

		config.init_data = init_data->init_data;

		config.driver_data = priv;



		priv->regulators[i] = regulator_register(desc, &config);

		if (IS_ERR(priv->regulators[i])) {

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

				mc13783_regulators[i].desc.name);

drivers/regulator/mc13892-regulator.c

+6 −2
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) 
	struct mc13xxx_regulator_platform_data *pdata =

		dev_get_platdata(&pdev->dev);

	struct mc13xxx_regulator_init_data *mc13xxx_data;

	struct regulator_config config = { };

	int i, ret;

	int num_regulators = 0;

	u32 val;
@@ -588,9 +589,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev) 
		}

		desc = &mc13892_regulators[id].desc;



		priv->regulators[i] = regulator_register(

			desc, &pdev->dev, init_data, priv, node);

		config.dev = &pdev->dev;

		config.init_data = init_data;

		config.driver_data = priv;

		config.of_node = node;



		priv->regulators[i] = regulator_register(desc, &config);

		if (IS_ERR(priv->regulators[i])) {

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

				mc13892_regulators[i].desc.name);