regulator: da9052: Convert to regulator core's simplified DT parsing code

Use regulator core's simplified DT parsing code to simply the driver
implementation.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c
index cefa355..98d4863 100644 (file)
--- a/drivers/regulator/da9052-regulator.c
+++ b/drivers/regulator/da9052-regulator.c
@@ -294,6 +294,8 @@ static const struct regulator_ops da9052_ldo_ops = {
 {\
        .reg_desc = {\
                .name = #_name,\
+               .of_match = of_match_ptr(#_name),\
+               .regulators_node = of_match_ptr("regulators"),\
                .ops = &da9052_ldo_ops,\
                .type = REGULATOR_VOLTAGE,\
                .id = DA9052_ID_##_id,\
@@ -314,6 +316,8 @@ static const struct regulator_ops da9052_ldo_ops = {
 {\
        .reg_desc = {\
                .name = #_name,\
+               .of_match = of_match_ptr(#_name),\
+               .regulators_node = of_match_ptr("regulators"),\
                .ops = &da9052_dcdc_ops,\
                .type = REGULATOR_VOLTAGE,\
                .id = DA9052_ID_##_id,\
@@ -417,36 +421,11 @@ static int da9052_regulator_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       config.dev = &pdev->dev;
+       config.dev = da9052->dev;
        config.driver_data = regulator;
        config.regmap = da9052->regmap;
-       if (pdata) {
+       if (pdata)
                config.init_data = pdata->regulators[cell->id];
-       } else {
-#ifdef CONFIG_OF
-               struct device_node *nproot = da9052->dev->of_node;
-               struct device_node *np;
-
-               if (!nproot)
-                       return -ENODEV;
-
-               nproot = of_get_child_by_name(nproot, "regulators");
-               if (!nproot)
-                       return -ENODEV;
-
-               for_each_child_of_node(nproot, np) {
-                       if (of_node_name_eq(np,
-                                        regulator->info->reg_desc.name)) {
-                               config.init_data = of_get_regulator_init_data(
-                                       &pdev->dev, np,
-                                       &regulator->info->reg_desc);
-                               config.of_node = np;
-                               break;
-                       }
-               }
-               of_node_put(nproot);
-#endif
-       }
 
        regulator->rdev = devm_regulator_register(&pdev->dev,
                                                  &regulator->info->reg_desc,