OPP: of: Simplify with scoped for each OF child loop

[PATCH] OPP: of: Simplify with scoped for each OF child loop

Posted by Krzysztof Kozlowski 1 month, 1 week ago

Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
 drivers/opp/of.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/opp/of.c b/drivers/opp/of.c
index 1e0d0adb18e1..a268c2b250c0 100644
--- a/drivers/opp/of.c
+++ b/drivers/opp/of.c
@@ -956,7 +956,6 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
 /* Initializes OPP tables based on new bindings */
 static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)
 {
-	struct device_node *np;
 	int ret, count = 0;
 	struct dev_pm_opp *opp;
 
@@ -971,13 +970,12 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)
 	}
 
 	/* We have opp-table node now, iterate over it and add OPPs */
-	for_each_available_child_of_node(opp_table->np, np) {
+	for_each_available_child_of_node_scoped(opp_table->np, np) {
 		opp = _opp_add_static_v2(opp_table, dev, np);
 		if (IS_ERR(opp)) {
 			ret = PTR_ERR(opp);
 			dev_err(dev, "%s: Failed to add OPP, %d\n", __func__,
 				ret);
-			of_node_put(np);
 			goto remove_static_opp;
 		} else if (opp) {
 			count++;
-- 
2.51.0

Re: [PATCH] OPP: of: Simplify with scoped for each OF child loop

Posted by Viresh Kumar 1 month ago

On 02-01-26, 13:49, Krzysztof Kozlowski wrote:
> Use scoped for-each loop when iterating over device nodes to make code a
> bit simpler.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
> ---
>  drivers/opp/of.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/opp/of.c b/drivers/opp/of.c
> index 1e0d0adb18e1..a268c2b250c0 100644
> --- a/drivers/opp/of.c
> +++ b/drivers/opp/of.c
> @@ -956,7 +956,6 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
>  /* Initializes OPP tables based on new bindings */
>  static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)
>  {
> -	struct device_node *np;
>  	int ret, count = 0;
>  	struct dev_pm_opp *opp;
>  
> @@ -971,13 +970,12 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)
>  	}
>  
>  	/* We have opp-table node now, iterate over it and add OPPs */
> -	for_each_available_child_of_node(opp_table->np, np) {
> +	for_each_available_child_of_node_scoped(opp_table->np, np) {
>  		opp = _opp_add_static_v2(opp_table, dev, np);
>  		if (IS_ERR(opp)) {
>  			ret = PTR_ERR(opp);
>  			dev_err(dev, "%s: Failed to add OPP, %d\n", __func__,
>  				ret);
> -			of_node_put(np);
>  			goto remove_static_opp;
>  		} else if (opp) {
>  			count++;

Applied. Thanks.

-- 
viresh