[PATCH 1/2] regulator: max8997: Use of_get_child_count()

[PATCH 1/2] regulator: max8997: Use of_get_child_count()

[Axel Lin]

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
 drivers/regulator/max8997.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c
index 7d2b1b5..c780104 100644
--- a/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@ -930,9 +930,7 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
 	}
 
 	/* count the number of regulators to be supported in pmic */
-	pdata->num_regulators = 0;
-	for_each_child_of_node(regulators_np, reg_np)
-		pdata->num_regulators++;
+	pdata->num_regulators = of_get_child_count(regulators_np);
 
 	rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *
 				pdata->num_regulators, GFP_KERNEL);
-- 
1.7.9.5

[PATCH 2/2] regulator: mc13xxx: Use of_get_child_count()

[Axel Lin]

Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
hi Mark,
I generate this patch against for-next branch of regulator tree.
So this patch is on top of commit c92f5dd2c "regulator: Add missing of_node_put()".

Which means it can only be applied to topic/of branch now.
If you prefer apply it to other branch, I can resend and generate the patch against
proper topic branch.

Axel

 drivers/regulator/mc13xxx-regulator-core.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index 04cf962..5186adc 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -164,17 +164,15 @@ EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);
 #ifdef CONFIG_OF
 int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
 {
-	struct device_node *parent, *child;
-	int num = 0;
+	struct device_node *parent;
+	int num;
 
 	of_node_get(pdev->dev.parent->of_node);
 	parent = of_find_node_by_name(pdev->dev.parent->of_node, "regulators");
 	if (!parent)
 		return -ENODEV;
 
-	for_each_child_of_node(parent, child)
-		num++;
-
+	num = of_get_child_count(parent);
 	of_node_put(parent);
 	return num;
 }
-- 
1.7.9.5

Re: [PATCH 1/2] regulator: max8997: Use of_get_child_count()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 129 bytes --]

On Wed, Jan 30, 2013 at 08:52:49PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <axel.lin@ingics.com>

Applied both, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]