diff options
| author |   Mark Brown <broonie@kernel.org> | 2014-09-06 12:10:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-06 12:43:40 +0100 |
| commit | 81baf9fe0243a4450d738676ccf99d325460c748 (patch) | |
| tree | f690047c58e00482f04bacb6c126898808cfc974 /drivers/regulator/tps65217-regulator.c | |
| parent | Linux 3.17-rc1 (diff) | |
| download | linux-dev-81baf9fe0243a4450d738676ccf99d325460c748.tar.xz linux-dev-81baf9fe0243a4450d738676ccf99d325460c748.zip | |
regulator: tps65217: Remove spurious platform data check
We should always be able to probe a regulator with no platform data. This
will enable readback of current state, though no changes can be made to
the device configuration.
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/tps65217-regulator.c')
| -rw-r--r-- | drivers/regulator/tps65217-regulator.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index d58db72a63b0..1cf16aed9735 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c @@ -230,11 +230,6 @@ static int tps65217_regulator_probe(struct platform_device *pdev) if (tps->dev->of_node) pdata = tps65217_parse_dt(pdev); - if (!pdata) { - dev_err(&pdev->dev, "Platform data not found\n"); - return -EINVAL; - } - if (tps65217_chip_id(tps) != TPS65217) { dev_err(&pdev->dev, "Invalid tps chip version\n"); return -ENODEV; @@ -245,7 +240,8 @@ static int tps65217_regulator_probe(struct platform_device *pdev) for (i = 0; i < TPS65217_NUM_REGULATOR; i++) { /* Register the regulators */ config.dev = tps->dev; - config.init_data = pdata->tps65217_init_data[i]; + if (pdata) + config.init_data = pdata->tps65217_init_data[i]; config.driver_data = tps; config.regmap = tps->regmap; if (tps->dev->of_node) |