UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mark Brown 2014-09-06 12:10:47 +01:00
parent 7d1311b93e
commit 81baf9fe02
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/tps65217-regulator.c
View File

@ -230,11 +230,6 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
if (tps->dev->of_node) if (tps->dev->of_node)
pdata = tps65217_parse_dt(pdev); pdata = tps65217_parse_dt(pdev);
if (!pdata) {
dev_err(&pdev->dev, "Platform data not found\n");
return -EINVAL;
}
if (tps65217_chip_id(tps) != TPS65217) { if (tps65217_chip_id(tps) != TPS65217) {
dev_err(&pdev->dev, "Invalid tps chip version\n"); dev_err(&pdev->dev, "Invalid tps chip version\n");
return -ENODEV; return -ENODEV;
@ -245,7 +240,8 @@ static int tps65217_regulator_probe(struct platform_device *pdev)
for (i = 0; i < TPS65217_NUM_REGULATOR; i++) { for (i = 0; i < TPS65217_NUM_REGULATOR; i++) {
/* Register the regulators */ /* Register the regulators */
config.dev = tps->dev; 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.driver_data = tps;
config.regmap = tps->regmap; config.regmap = tps->regmap;
if (tps->dev->of_node) if (tps->dev->of_node)