* [PATCH 1/2] regulator: cpcap: Remove unneeded init_data setting
@ 2019-03-16 14:35 Axel Lin
2019-03-16 14:35 ` [PATCH 2/2] regulator: cpcap: Convert to use of_device_get_match_data Axel Lin
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2019-03-16 14:35 UTC (permalink / raw)
To: Mark Brown
Cc: Tony Lindgren, Sebastian Reichel, Liam Girdwood, linux-kernel, Axel Lin
This driver is using regulator core's simplified DT parsing code,
so regulator will call regulator_of_get_init_data() to get init_data.
No need to set config.init_data. In additional, current code does not
properly set the init_data setting, so just remove it.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/cpcap-regulator.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/regulator/cpcap-regulator.c b/drivers/regulator/cpcap-regulator.c
index e7dab5c4d1d1..c9d805d7a979 100644
--- a/drivers/regulator/cpcap-regulator.c
+++ b/drivers/regulator/cpcap-regulator.c
@@ -507,7 +507,6 @@ static int cpcap_regulator_probe(struct platform_device *pdev)
struct cpcap_ddata *ddata;
const struct of_device_id *match;
struct regulator_config config;
- struct regulator_init_data init_data;
int i;
match = of_match_device(of_match_ptr(cpcap_regulator_id_table),
@@ -534,10 +533,8 @@ static int cpcap_regulator_probe(struct platform_device *pdev)
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];
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] regulator: cpcap: Convert to use of_device_get_match_data
2019-03-16 14:35 [PATCH 1/2] regulator: cpcap: Remove unneeded init_data setting Axel Lin
@ 2019-03-16 14:35 ` Axel Lin
0 siblings, 0 replies; 2+ messages in thread
From: Axel Lin @ 2019-03-16 14:35 UTC (permalink / raw)
To: Mark Brown
Cc: Tony Lindgren, Sebastian Reichel, Liam Girdwood, linux-kernel, Axel Lin
Use of_device_get_match_data to simplify the code a bit.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/cpcap-regulator.c | 12 ++++--------
1 file 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));
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-16 14:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-16 14:35 [PATCH 1/2] regulator: cpcap: Remove unneeded init_data setting Axel Lin
2019-03-16 14:35 ` [PATCH 2/2] regulator: cpcap: Convert to use of_device_get_match_data Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).