regulator: ab8500: Use a struct to select the good regulator configuration

At the probe use a structure to select the good regulator array from
from ab9540, ab8505, ab8540 or ab8500 configuration.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 64 insertions, 71 deletions

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index ef12d3d79bdf..9cb634807ff8 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -2860,10 +2860,19 @@ static struct ab8500_reg_init ab8540_reg_init[] = {
         REG_INIT(AB8540_REGUCTRLDISCH4,         0x04, 0x49, 0x07),
 };
 
+static struct {
+        struct ab8500_regulator_info *info;
+        int info_size;
+        struct ab8500_reg_init *init;
+        int init_size;
+        struct of_regulator_match *match;
+        int match_size;
+} abx500_regulator;
+
 static int ab8500_regulator_init_registers(struct platform_device *pdev,
-                                           struct ab8500_reg_init *reg_init,
                                            int id, int mask, int value)
 {
+        struct ab8500_reg_init *reg_init = abx500_regulator.init;
         int err;
 
         BUG_ON(value & ~mask);
@@ -2893,7 +2902,6 @@ static int ab8500_regulator_init_registers(struct platform_device *pdev,
 
 static int ab8500_regulator_register(struct platform_device *pdev,
                                      struct regulator_init_data *init_data,
-                                     struct ab8500_regulator_info *regulator_info,
                                      int id, struct device_node *np)
 {
         struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
@@ -2902,7 +2910,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,
         int err;
 
         /* assign per-regulator data */
-        info = &regulator_info[id];
+        info = &abx500_regulator.info[id];
         info->dev = &pdev->dev;
 
         config.dev = &pdev->dev;
@@ -2928,7 +2936,7 @@ static int ab8500_regulator_register(struct platform_device *pdev,
                         info->desc.name);
                 /* when we fail, un-register all earlier regulators */
                 while (--id >= 0) {
-                        info = &regulator_info[id];
+                        info = &abx500_regulator.info[id];
                         regulator_unregister(info->regulator);
                 }
                 return err;
@@ -2995,19 +3003,49 @@ static struct of_regulator_match ab9540_regulator_match[] = {
         { .name = "ab8500_ldo_ana",     .driver_data = (void *) AB9540_LDO_ANA, },
 };
 
+static void abx500_get_regulator_info(struct ab8500 *ab8500)
+{
+        if (is_ab9540(ab8500)) {
+                abx500_regulator.info = ab9540_regulator_info;
+                abx500_regulator.info_size = ARRAY_SIZE(ab9540_regulator_info);
+                abx500_regulator.init = ab9540_reg_init;
+                abx500_regulator.init_size = AB9540_NUM_REGULATOR_REGISTERS;
+                abx500_regulator.match = ab9540_regulator_match;
+                abx500_regulator.match_size = ARRAY_SIZE(ab9540_regulator_match);
+        } else if (is_ab8505(ab8500)) {
+                abx500_regulator.info = ab8505_regulator_info;
+                abx500_regulator.info_size = ARRAY_SIZE(ab8505_regulator_info);
+                abx500_regulator.init = ab8505_reg_init;
+                abx500_regulator.init_size = AB8505_NUM_REGULATOR_REGISTERS;
+                abx500_regulator.match = ab8505_regulator_match;
+                abx500_regulator.match_size = ARRAY_SIZE(ab8505_regulator_match);
+        } else if (is_ab8540(ab8500)) {
+                abx500_regulator.info = ab8540_regulator_info;
+                abx500_regulator.info_size = ARRAY_SIZE(ab8540_regulator_info);
+                abx500_regulator.init = ab8540_reg_init;
+                abx500_regulator.init_size = AB8540_NUM_REGULATOR_REGISTERS;
+                abx500_regulator.match = ab8540_regulator_match;
+                abx500_regulator.match_size = ARRAY_SIZE(ab8540_regulator_match);
+        } else {
+                abx500_regulator.info = ab8500_regulator_info;
+                abx500_regulator.info_size = ARRAY_SIZE(ab8500_regulator_info);
+                abx500_regulator.init = ab8500_reg_init;
+                abx500_regulator.init_size = AB8500_NUM_REGULATOR_REGISTERS;
+                abx500_regulator.match = ab8500_regulator_match;
+                abx500_regulator.match_size = ARRAY_SIZE(ab8500_regulator_match);
+        }
+}
+
 static int
 ab8500_regulator_of_probe(struct platform_device *pdev,
-                          struct ab8500_regulator_info *regulator_info,
-                          int regulator_info_size,
-                          struct of_regulator_match *match,
                           struct device_node *np)
 {
+        struct of_regulator_match *match = abx500_regulator.match;
         int err, i;
 
-        for (i = 0; i < regulator_info_size; i++) {
+        for (i = 0; i < abx500_regulator.info_size; i++) {
                 err = ab8500_regulator_register(
-                        pdev, match[i].init_data, regulator_info,
-                        i, match[i].of_node);
+                        pdev, match[i].init_data, i, match[i].of_node);
                 if (err)
                         return err;
         }
@@ -3019,59 +3057,31 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
 {
         struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
         struct device_node *np = pdev->dev.of_node;
-        struct of_regulator_match *match;
         struct ab8500_platform_data *ppdata;
         struct ab8500_regulator_platform_data *pdata;
         int i, err;
-        struct ab8500_regulator_info *regulator_info;
-        int regulator_info_size;
-        struct ab8500_reg_init *reg_init;
-        int reg_init_size;
 
-        if (is_ab9540(ab8500)) {
-                regulator_info = ab9540_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab9540_regulator_info);
-                reg_init = ab9540_reg_init;
-                reg_init_size = AB9540_NUM_REGULATOR_REGISTERS;
-                match = ab9540_regulator_match;
-                match_size = ARRAY_SIZE(ab9540_regulator_match)
-        } else if (is_ab8505(ab8500)) {
-                regulator_info = ab8505_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab8505_regulator_info);
-                reg_init = ab8505_reg_init;
-                reg_init_size = AB8505_NUM_REGULATOR_REGISTERS;
-        } else if (is_ab8540(ab8500)) {
-                regulator_info = ab8540_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab8540_regulator_info);
-                reg_init = ab8540_reg_init;
-                reg_init_size = AB8540_NUM_REGULATOR_REGISTERS;
-        } else {
-                regulator_info = ab8500_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab8500_regulator_info);
-                reg_init = ab8500_reg_init;
-                reg_init_size = AB8500_NUM_REGULATOR_REGISTERS;
-                match = ab8500_regulator_match;
-                match_size = ARRAY_SIZE(ab8500_regulator_match)
+        if (!ab8500) {
+                dev_err(&pdev->dev, "null mfd parent\n");
+                return -EINVAL;
         }
 
+        abx500_get_regulator_info(ab8500);
+
         if (np) {
-                err = of_regulator_match(&pdev->dev, np, match, match_size);
+                err = of_regulator_match(&pdev->dev, np,
+                                         abx500_regulator.match,
+                                         abx500_regulator.match_size);
                 if (err < 0) {
                         dev_err(&pdev->dev,
                                 "Error parsing regulator init data: %d\n", err);
                         return err;
                 }
 
-                err = ab8500_regulator_of_probe(pdev, regulator_info,
-                                                regulator_info_size, match, np);
+                err = ab8500_regulator_of_probe(pdev, np);
                 return err;
         }
 
-        if (!ab8500) {
-                dev_err(&pdev->dev, "null mfd parent\n");
-                return -EINVAL;
-        }
-
         ppdata = dev_get_platdata(ab8500->dev);
         if (!ppdata) {
                 dev_err(&pdev->dev, "null parent pdata\n");
@@ -3085,7 +3095,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
         }
 
         /* make sure the platform data has the correct size */
-        if (pdata->num_regulator != regulator_info_size) {
+        if (pdata->num_regulator != abx500_regulator.info_size) {
                 dev_err(&pdev->dev, "Configuration error: size mismatch.\n");
                 return -EINVAL;
         }
@@ -3104,9 +3114,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
                 value = pdata->reg_init[i].value;
 
                 /* check for configuration errors */
-                BUG_ON(id >= AB8500_NUM_REGULATOR_REGISTERS);
+                BUG_ON(id >= abx500_regulator.init_size);
 
-                err = ab8500_regulator_init_registers(pdev, reg_init, id, mask, value);
+                err = ab8500_regulator_init_registers(pdev, id, mask, value);
                 if (err < 0)
                         return err;
         }
@@ -3119,9 +3129,9 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
         }
 
         /* register all regulators */
-        for (i = 0; i < regulator_info_size; i++) {
+        for (i = 0; i < abx500_regulator.info_size; i++) {
                 err = ab8500_regulator_register(pdev, &pdata->regulator[i],
-                                                regulator_info, i, NULL);
+                                                i, NULL);
                 if (err < 0)
                         return err;
         }
@@ -3133,27 +3143,10 @@ static int ab8500_regulator_remove(struct platform_device *pdev)
 {
         int i, err;
         struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
-        struct ab8500_regulator_info *regulator_info;
-        int regulator_info_size;
-
-
-        if (is_ab9540(ab8500)) {
-                regulator_info = ab9540_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab9540_regulator_info);
-        } else if (is_ab8505(ab8500)) {
-                regulator_info = ab8505_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab8505_regulator_info);
-        } else if (is_ab8540(ab8500)) {
-                regulator_info = ab8540_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab8540_regulator_info);
-        } else {
-                regulator_info = ab8500_regulator_info;
-                regulator_info_size = ARRAY_SIZE(ab8500_regulator_info);
-        }
 
-        for (i = 0; i < regulator_info_size; i++) {
+        for (i = 0; i < abx500_regulator.info_size; i++) {
                 struct ab8500_regulator_info *info = NULL;
-                info = &regulator_info[i];
+                info = &abx500_regulator.info[i];
 
                 dev_vdbg(rdev_get_dev(info->regulator),
                         "%s-remove\n", info->desc.name);