regulator: of: Add regulator desc param to of_get_regulator_init_data()

[deliverable/linux.git] / drivers / regulator / fixed.c

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 354105eff1f80ed392951b41518e3062eac70582..6cfcbc8b6594073f41ea4cc6c25e51ceb3f95163 100644 (file)
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -40,13 +40,15 @@ struct fixed_voltage_data {
 /**
  * of_get_fixed_voltage_config - extract fixed_voltage_config structure info
  * @dev: device requesting for fixed_voltage_config
+ * @desc: regulator description
  *
  * Populates fixed_voltage_config structure by extracting data from device
  * tree node, returns a pointer to the populated structure of NULL if memory
  * alloc fails.
  */
 static struct fixed_voltage_config *
-of_get_fixed_voltage_config(struct device *dev)
+of_get_fixed_voltage_config(struct device *dev,
+                           const struct regulator_desc *desc)
 {
        struct fixed_voltage_config *config;
        struct device_node *np = dev->of_node;
@@ -57,7 +59,7 @@ of_get_fixed_voltage_config(struct device *dev)
        if (!config)
                return ERR_PTR(-ENOMEM);
 
-       config->init_data = of_get_regulator_init_data(dev, dev->of_node);
+       config->init_data = of_get_regulator_init_data(dev, dev->of_node, desc);
        if (!config->init_data)
                return ERR_PTR(-EINVAL);
 
@@ -112,8 +114,14 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
        struct regulator_config cfg = { };
        int ret;
 
+       drvdata = devm_kzalloc(&pdev->dev, sizeof(struct fixed_voltage_data),
+                              GFP_KERNEL);
+       if (!drvdata)
+               return -ENOMEM;
+
        if (pdev->dev.of_node) {
-               config = of_get_fixed_voltage_config(&pdev->dev);
+               config = of_get_fixed_voltage_config(&pdev->dev,
+                                                    &drvdata->desc);
                if (IS_ERR(config))
                        return PTR_ERR(config);
        } else {
@@ -123,11 +131,6 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
        if (!config)
                return -ENOMEM;
 
-       drvdata = devm_kzalloc(&pdev->dev, sizeof(struct fixed_voltage_data),
-                              GFP_KERNEL);
-       if (!drvdata)
-               return -ENOMEM;
-
        drvdata->desc.name = devm_kstrdup(&pdev->dev,
                                          config->supply_name,
                                          GFP_KERNEL);