aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/mc13783-regulator.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-04-10 01:51:06 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-10 04:52:53 -0400
commita9d5801041eecc7baceff49a28e82f91f207a961 (patch)
treec45260aa9390222926e89a2a34c5d1b6cf1ce21e /drivers/regulator/mc13783-regulator.c
parentfe53d18def245f11fe501d403dd08639927c16f3 (diff)
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: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/mc13783-regulator.c')
-rw-r--r--drivers/regulator/mc13783-regulator.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c
index 6c0face87ffe..7dcdfa283e93 100644
--- a/drivers/regulator/mc13783-regulator.c
+++ b/drivers/regulator/mc13783-regulator.c
@@ -340,6 +340,7 @@ static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
340 struct mc13xxx_regulator_platform_data *pdata = 340 struct mc13xxx_regulator_platform_data *pdata =
341 dev_get_platdata(&pdev->dev); 341 dev_get_platdata(&pdev->dev);
342 struct mc13xxx_regulator_init_data *init_data; 342 struct mc13xxx_regulator_init_data *init_data;
343 struct regulator_config config = { };
343 int i, ret; 344 int i, ret;
344 345
345 dev_dbg(&pdev->dev, "%s id %d\n", __func__, pdev->id); 346 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)
357 priv->mc13xxx = mc13783; 358 priv->mc13xxx = mc13783;
358 359
359 for (i = 0; i < pdata->num_regulators; i++) { 360 for (i = 0; i < pdata->num_regulators; i++) {
361 struct regulator_desc *desc;
362
360 init_data = &pdata->regulators[i]; 363 init_data = &pdata->regulators[i];
361 priv->regulators[i] = regulator_register( 364 desc = &mc13783_regulators[init_data->id].desc;
362 &mc13783_regulators[init_data->id].desc, 365
363 &pdev->dev, init_data->init_data, priv, NULL); 366 config.dev = &pdev->dev;
367 config.init_data = init_data->init_data;
368 config.driver_data = priv;
364 369
370 priv->regulators[i] = regulator_register(desc, &config);
365 if (IS_ERR(priv->regulators[i])) { 371 if (IS_ERR(priv->regulators[i])) {
366 dev_err(&pdev->dev, "failed to register regulator %s\n", 372 dev_err(&pdev->dev, "failed to register regulator %s\n",
367 mc13783_regulators[i].desc.name); 373 mc13783_regulators[i].desc.name);