diff options
| author | Axel Lin <axel.lin@ingics.com> | 2014-02-21 21:42:23 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-03 12:00:39 +0800 |
| commit | 94ee607c961e26f9e09d6e4b4818435b4b61f644 (patch) | |
| tree | 152eaabc22c560e3971926aa952f6078658e3701 /drivers/regulator/tps65217-regulator.c | |
| parent | 93195c33ebe0dd2da1cb0d0cccba2dc50296ae01 (diff) | |
| download | linux-0-day-94ee607c961e26f9e09d6e4b4818435b4b61f644.tar.gz linux-0-day-94ee607c961e26f9e09d6e4b4818435b4b61f644.tar.xz | |
regulator: tps65217: Allow missing init_data for diagnostics
The regulator core supports this to allow the configuration to be inspected
at runtime even if no software management is enabled.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/tps65217-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65217-regulator.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index fd441f2738f5a..10b78d2b766aa 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c @@ -202,7 +202,7 @@ static struct tps65217_board *tps65217_parse_dt(struct platform_device *pdev) return NULL; for (i = 0; i < count; i++) { - if (!reg_matches[i].init_data || !reg_matches[i].of_node) + if (!reg_matches[i].of_node) continue; pdata->tps65217_init_data[i] = reg_matches[i].init_data; @@ -222,7 +222,6 @@ static int tps65217_regulator_probe(struct platform_device *pdev) { struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent); struct tps65217_board *pdata = dev_get_platdata(tps->dev); - struct regulator_init_data *reg_data; struct regulator_dev *rdev; struct regulator_config config = { }; int i; @@ -243,19 +242,9 @@ static int tps65217_regulator_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tps); for (i = 0; i < TPS65217_NUM_REGULATOR; i++) { - - reg_data = pdata->tps65217_init_data[i]; - - /* - * Regulator API handles empty constraints but not NULL - * constraints - */ - if (!reg_data) - continue; - /* Register the regulators */ config.dev = tps->dev; - config.init_data = reg_data; + config.init_data = pdata->tps65217_init_data[i]; config.driver_data = tps; config.regmap = tps->regmap; if (tps->dev->of_node) |