diff options
| author |   Axel Lin <axel.lin@ingics.com> | 2014-02-06 14:49:11 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-02-11 12:27:45 +0000 |
| commit | 3f24bf70a4974122841eb13e3a0621680bd19501 (patch) | |
| tree | 77ab35b85307c4366deedf66273158f527958c66 /drivers/regulator/rc5t583-regulator.c | |
| parent | Linus 3.14-rc1 (diff) | |
| download | linux-dev-3f24bf70a4974122841eb13e3a0621680bd19501.tar.xz linux-dev-3f24bf70a4974122841eb13e3a0621680bd19501.zip | |
regulator: rc5t583: 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/rc5t583-regulator.c')
| -rw-r--r-- | drivers/regulator/rc5t583-regulator.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c index b58affb33143..22d6fd1281b1 100644 --- a/drivers/regulator/rc5t583-regulator.c +++ b/drivers/regulator/rc5t583-regulator.c @@ -119,7 +119,6 @@ static int rc5t583_regulator_probe(struct platform_device *pdev) { struct rc5t583 *rc5t583 = dev_get_drvdata(pdev->dev.parent); struct rc5t583_platform_data *pdata = dev_get_platdata(rc5t583->dev); - struct regulator_init_data *reg_data; struct regulator_config config = { }; struct rc5t583_regulator *reg = NULL; struct rc5t583_regulator *regs; @@ -142,12 +141,6 @@ static int rc5t583_regulator_probe(struct platform_device *pdev) for (id = 0; id < RC5T583_REGULATOR_MAX; ++id) { - reg_data = pdata->reg_init_data[id]; - - /* No need to register if there is no regulator data */ - if (!reg_data) - continue; - reg = ®s[id]; ri = &rc5t583_reg_info[id]; reg->reg_info = ri; @@ -169,7 +162,7 @@ static int rc5t583_regulator_probe(struct platform_device *pdev) skip_ext_pwr_config: config.dev = &pdev->dev; - config.init_data = reg_data; + config.init_data = pdata->reg_init_data[id]; config.driver_data = reg; config.regmap = rc5t583->regmap; |