regulator: Factor out location of init data OF node

To support future additions factor out the location of the OF node
containing the init data for the regulator from the code that parses the
init data.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index c711a0a..4bb8928 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -371,13 +371,10 @@ int of_regulator_match(struct device *dev, struct device_node *node,
 }
 EXPORT_SYMBOL_GPL(of_regulator_match);
 
-struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
-                                           const struct regulator_desc *desc,
-                                           struct regulator_config *config,
-                                           struct device_node **node)
+struct device_node *regulator_of_get_init_node(struct device *dev,
+                                              const struct regulator_desc *desc)
 {
        struct device_node *search, *child;
-       struct regulator_init_data *init_data = NULL;
        const char *name;
 
        if (!dev->of_node || !desc->of_match)
@@ -400,35 +397,48 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
                if (!name)
                        name = child->name;
 
-               if (strcmp(desc->of_match, name))
-                       continue;
+               if (!strcmp(desc->of_match, name))
+                       return of_node_get(child);
+       }
 
-               init_data = of_get_regulator_init_data(dev, child, desc);
-               if (!init_data) {
-                       dev_err(dev,
-                               "failed to parse DT for regulator %pOFn\n",
-                               child);
-                       break;
-               }
+       of_node_put(search);
 
-               if (desc->of_parse_cb) {
-                       if (desc->of_parse_cb(child, desc, config)) {
-                               dev_err(dev,
-                                       "driver callback failed to parse DT for regulator %pOFn\n",
-                                       child);
-                               init_data = NULL;
-                               break;
-                       }
-               }
+       return NULL;
+}
 
-               of_node_get(child);
-               *node = child;
-               break;
+struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
+                                           const struct regulator_desc *desc,
+                                           struct regulator_config *config,
+                                           struct device_node **node)
+{
+       struct device_node *child;
+       struct regulator_init_data *init_data = NULL;
+
+       child = regulator_of_get_init_node(dev, desc);
+       if (!child)
+               return NULL;
+
+       init_data = of_get_regulator_init_data(dev, child, desc);
+       if (!init_data) {
+               dev_err(dev, "failed to parse DT for regulator %pOFn\n", child);
+               goto error;
        }
 
-       of_node_put(search);
+       if (desc->of_parse_cb && desc->of_parse_cb(child, desc, config)) {
+               dev_err(dev,
+                       "driver callback failed to parse DT for regulator %pOFn\n",
+                       child);
+               goto error;
+       }
+
+       *node = child;
 
        return init_data;
+
+error:
+       of_node_put(child);
+
+       return NULL;
 }
 
 static int of_node_match(struct device *dev, const void *data)