regulator: ab8500: Split up probe() into manageable pieces

ab8500's probe() function is becoming quite large, so in the lead
up to Device Tree enablement which will fork the thread of execution
this patch splits it into 3 main areas; basic error checking will
remain in probe(), but regulator register initialisation and regulator
registration have been moved to their own functions which will
be called in sequence by probe() and the DT equivalent.
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>

drivers/regulator/ab8500.c

@@ -708,51 +708,19 @@ static struct ab8500_reg_init ab8500_reg_init[] = {
 	REG_INIT(AB8500_REGUCTRLDISCH2,		0x04, 0x44, 0x16),
 };
 
-static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
+static __devinit int
+ab8500_regulator_init_registers(struct platform_device *pdev, int id, int value)
 {
-	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
-	struct ab8500_platform_data *pdata;
-	struct regulator_config config = { };
-	int i, err;
+	int err;
 
-	if (!ab8500) {
-		dev_err(&pdev->dev, "null mfd parent\n");
-		return -EINVAL;
-	}
-	pdata = dev_get_platdata(ab8500->dev);
-	if (!pdata) {
-		dev_err(&pdev->dev, "null pdata\n");
-		return -EINVAL;
-	}
-
-	/* make sure the platform data has the correct size */
-	if (pdata->num_regulator != ARRAY_SIZE(ab8500_regulator_info)) {
-		dev_err(&pdev->dev, "Configuration error: size mismatch.\n");
-		return -EINVAL;
-	}
-
-	/* initialize registers */
-	for (i = 0; i < pdata->num_regulator_reg_init; i++) {
-		int id;
-		u8 value;
-
-		id = pdata->regulator_reg_init[i].id;
-		value = pdata->regulator_reg_init[i].value;
-
-		/* check for configuration errors */
-		if (id >= AB8500_NUM_REGULATOR_REGISTERS) {
-			dev_err(&pdev->dev,
-				"Configuration error: id outside range.\n");
-			return -EINVAL;
-		}
 	if (value & ~ab8500_reg_init[id].mask) {
 		dev_err(&pdev->dev,
 			"Configuration error: value outside mask.\n");
 		return -EINVAL;
 	}
 
-		/* initialize register */
-		err = abx500_mask_and_set_register_interruptible(&pdev->dev,
+	err = abx500_mask_and_set_register_interruptible(
+		&pdev->dev,
 		ab8500_reg_init[id].bank,
 		ab8500_reg_init[id].addr,
 		ab8500_reg_init[id].mask,
@@ -764,25 +732,34 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
 			ab8500_reg_init[id].addr);
 		return err;
 	}
+
 	dev_vdbg(&pdev->dev,
-			"  init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
+		"init: 0x%02x, 0x%02x, 0x%02x, 0x%02x\n",
 		ab8500_reg_init[id].bank,
 		ab8500_reg_init[id].addr,
 		ab8500_reg_init[id].mask,
 		value);
-	}
 
-	/* register all regulators */
-	for (i = 0; i < ARRAY_SIZE(ab8500_regulator_info); i++) {
+	return 0;
+}
+
+static __devinit int ab8500_regulator_register(struct platform_device *pdev,
+					struct regulator_init_data *init_data,
+					int id,
+					struct device_node *np)
+{
 	struct ab8500_regulator_info *info = NULL;
+	struct regulator_config config = { };
+	int err;
 
 	/* assign per-regulator data */
-		info = &ab8500_regulator_info[i];
+	info = &ab8500_regulator_info[id];
 	info->dev = &pdev->dev;
 
 	config.dev = &pdev->dev;
-		config.init_data = &pdata->regulator[i];
+	config.init_data = init_data;
 	config.driver_data = info;
+	config.of_node = np;
 
 	/* fix for hardware before ab8500v2.0 */
 	if (abx500_get_chip_id(info->dev) < 0x20) {
@@ -803,15 +780,62 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "failed to register regulator %s\n",
 			info->desc.name);
 		/* when we fail, un-register all earlier regulators */
-			while (--i >= 0) {
-				info = &ab8500_regulator_info[i];
+		while (--id >= 0) {
+			info = &ab8500_regulator_info[id];
 			regulator_unregister(info->regulator);
 		}
 		return err;
 	}
 
-		dev_vdbg(rdev_get_dev(info->regulator),
-			"%s-probed\n", info->desc.name);
+	return 0;
+}
+
+static __devinit int ab8500_regulator_probe(struct platform_device *pdev)
+{
+	struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
+	struct ab8500_platform_data *pdata;
+	int i, err;
+
+	if (!ab8500) {
+		dev_err(&pdev->dev, "null mfd parent\n");
+		return -EINVAL;
+	}
+	pdata = dev_get_platdata(ab8500->dev);
+	if (!pdata) {
+		dev_err(&pdev->dev, "null pdata\n");
+		return -EINVAL;
+	}
+
+	/* make sure the platform data has the correct size */
+	if (pdata->num_regulator != ARRAY_SIZE(ab8500_regulator_info)) {
+		dev_err(&pdev->dev, "Configuration error: size mismatch.\n");
+		return -EINVAL;
+	}
+
+	/* initialize registers */
+	for (i = 0; i < pdata->num_regulator_reg_init; i++) {
+		int id, value;
+
+		id = pdata->regulator_reg_init[i].id;
+		value = pdata->regulator_reg_init[i].value;
+
+		/* check for configuration errors */
+		if (id >= AB8500_NUM_REGULATOR_REGISTERS) {
+			dev_err(&pdev->dev,
+				"Configuration error: id outside range.\n");
+			return -EINVAL;
+		}
+
+		err = ab8500_regulator_init_registers(pdev, id, value);
+		if (err < 0)
+			return err;
+	}
+
+	/* register all regulators */
+	for (i = 0; i < ARRAY_SIZE(ab8500_regulator_info); i++) {
+		err = ab8500_regulator_register(pdev, &pdata->regulator[i], i, NULL);
+		if (err < 0)
+			return err;
 	}
 
 	return 0;