Applied "regulator: da9052: Convert to regulator core's simplified DT parsing code" to the regulator tree

[Mark Brown]

The patch

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

has been applied to the regulator tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 67ddc68a78b1b762a8799a8cd9c075c7edcd546a Mon Sep 17 00:00:00 2001
From: Axel Lin <axel....@ingics.com>
Date: Tue, 12 Mar 2019 23:47:58 +0800
Subject: [PATCH] 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....@ingics.com>
Signed-off-by: Mark Brown <broo...@kernel.org>
---
 drivers/regulator/da9052-regulator.c | 33 +++++-----------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/drivers/regulator/da9052-regulator.c 
b/drivers/regulator/da9052-regulator.c
index cefa3558236d..98d486372b8c 100644
--- 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,
-- 
2.20.1