diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-05-06 22:52:14 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-05-06 22:52:14 +0900 |
| commit | e2a23affe6a6a15111ae56edd7e4f3c9673ef201 (patch) | |
| tree | a69d90bfe04ff687e8ccde00ddac9aea357e33e6 /drivers/regulator/cpcap-regulator.c | |
| parent | Merge branch 'regulator-5.1' into regulator-linus (diff) | |
| parent | regulator: core: simplify return value on suported_voltage (diff) | |
| download | linux-dev-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.tar.xz linux-dev-e2a23affe6a6a15111ae56edd7e4f3c9673ef201.zip | |
Merge branch 'regulator-5.2' into regulator-next
Diffstat (limited to 'drivers/regulator/cpcap-regulator.c')
| -rw-r--r-- | drivers/regulator/cpcap-regulator.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/regulator/cpcap-regulator.c b/drivers/regulator/cpcap-regulator.c index e7dab5c4d1d1..d3284361e594 100644 --- a/drivers/regulator/cpcap-regulator.c +++ b/drivers/regulator/cpcap-regulator.c @@ -505,17 +505,12 @@ MODULE_DEVICE_TABLE(of, cpcap_regulator_id_table); static int cpcap_regulator_probe(struct platform_device *pdev) { struct cpcap_ddata *ddata; - const struct of_device_id *match; + const struct cpcap_regulator *match_data; struct regulator_config config; - struct regulator_init_data init_data; int i; - match = of_match_device(of_match_ptr(cpcap_regulator_id_table), - &pdev->dev); - if (!match) - return -EINVAL; - - if (!match->data) { + match_data = of_device_get_match_data(&pdev->dev); + if (!match_data) { dev_err(&pdev->dev, "no configuration data found\n"); return -ENODEV; @@ -530,14 +525,12 @@ static int cpcap_regulator_probe(struct platform_device *pdev) return -ENODEV; ddata->dev = &pdev->dev; - ddata->soc = match->data; + ddata->soc = match_data; platform_set_drvdata(pdev, ddata); memset(&config, 0, sizeof(config)); - memset(&init_data, 0, sizeof(init_data)); config.dev = &pdev->dev; config.regmap = ddata->reg; - config.init_data = &init_data; for (i = 0; i < CPCAP_NR_REGULATORS; i++) { const struct cpcap_regulator *regulator = &ddata->soc[i]; |