diff options
author | Axel Lin <axel.lin@ingics.com> | 2019-03-16 17:35:58 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-18 15:10:31 +0300 |
commit | f4192c2cc923ecd79da6cc1619794164fbafcbc4 (patch) | |
tree | 6068ae1d35bef64f79d4eea2025c1d02da78eea0 | |
parent | 2106e9bbffb9d91b2bc1a33c09efadc8cb3906d2 (diff) | |
download | linux-f4192c2cc923ecd79da6cc1619794164fbafcbc4.tar.xz |
regulator: cpcap: Convert to use of_device_get_match_data
Use of_device_get_match_data to simplify the code a bit.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/regulator/cpcap-regulator.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/regulator/cpcap-regulator.c b/drivers/regulator/cpcap-regulator.c index c9d805d7a979..d3284361e594 100644 --- a/drivers/regulator/cpcap-regulator.c +++ b/drivers/regulator/cpcap-regulator.c @@ -505,16 +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; 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; @@ -529,7 +525,7 @@ 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)); |