regulator: pass device_node to of_get_regulator_init_data()

It's not always true that the device_node of regulator can be found
at dev->of_node at the time when of_get_regulator_init_data() is being
called, because in some cases the regulator nodes in device tree do
not have 'struct device' behind them until regulator_dev gets created
for it by core function regulator_register().

The patch adds device_node as a new parameter to
of_get_regulator_init_data(), so that caller can pass in the node of
regulator directly.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index ebec5e06dfa142f9003ec54b31dd53686b5d6291..12d08c694ae24a5b2070b68d3cded65ad56c0e93 100644 (file)
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -64,7 +64,7 @@ of_get_fixed_voltage_config(struct device *dev)
        if (!config)
                return NULL;
 
-       config->init_data = of_get_regulator_init_data(dev);
+       config->init_data = of_get_regulator_init_data(dev, dev->of_node);
        if (!config->init_data)
                return NULL;
 

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index b7b3fc3b09e2f4c1caeec214725a14d590786080..f1651eb6964807d9ae86c6ed88032199d5950199 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -69,18 +69,19 @@ static void of_get_regulation_constraints(struct device_node *np,
  * tree node, returns a pointer to the populated struture or NULL if memory
  * alloc fails.
  */
-struct regulator_init_data *of_get_regulator_init_data(struct device *dev)
+struct regulator_init_data *of_get_regulator_init_data(struct device *dev,
+                                               struct device_node *node)
 {
        struct regulator_init_data *init_data;
 
-       if (!dev->of_node)
+       if (!node)
                return NULL;
 
        init_data = devm_kzalloc(dev, sizeof(*init_data), GFP_KERNEL);
        if (!init_data)
                return NULL; /* Out of memory? */
 
-       of_get_regulation_constraints(dev->of_node, &init_data);
+       of_get_regulation_constraints(node, &init_data);
        return init_data;
 }
 EXPORT_SYMBOL_GPL(of_get_regulator_init_data);

diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index d83a98d3e3fdfc8bd40227ca299bf78fc94dcf62..769704f296e56b367729fe550f88b3f68cc15001 100644 (file)
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -8,10 +8,12 @@
 
 #if defined(CONFIG_OF)
 extern struct regulator_init_data
-       *of_get_regulator_init_data(struct device *dev);
+       *of_get_regulator_init_data(struct device *dev,
+                                   struct device_node *node);
 #else
 static inline struct regulator_init_data
-       *of_get_regulator_init_data(struct device *dev)
+       *of_get_regulator_init_data(struct device *dev,
+                                   struct device_node *node)
 {
        return NULL;
 }