Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: liviu.dudau@arm.com (liviu.dudau at arm.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] bus: vexpress-config: Add missing of_node_put
Date: Mon, 25 Jan 2016 12:17:20 +0000	[thread overview]
Message-ID: <20160125121720.GC1194@e106497-lin.cambridge.arm.com> (raw)
In-Reply-To: <20160122180838.GA12069@amitoj-Inspiron-3542>

On Fri, Jan 22, 2016 at 11:38:38PM +0530, Amitoj Kaur Chawla wrote:
> for_each_compatible_node performs an of_node_get on each iteration, so
> to break out of the loop an of_node_put is required.
> 
> Found using Coccinelle. The semantic patch used for this is as follows:
> 
> // <smpl>
> @@
> expression e;
> local idexpression n;
> @@
> 
>  for_each_compatible_node(n, ...) {
>    ... when != of_node_put(n)
>        when != e = n
> (
>    return n;
> +  of_node_put(n);
> ?  return ...;
> )
>    ...
>  }
> // </smpl>
> 
> Signed-off-by: Amitoj Kaur Chawla <amitoj1606@gmail.com>

Hi Amitoj,

> ---
>  drivers/bus/vexpress-config.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c
> index 6575c0f..c3cb76b 100644
> --- a/drivers/bus/vexpress-config.c
> +++ b/drivers/bus/vexpress-config.c
> @@ -192,8 +192,10 @@ static int __init vexpress_config_init(void)
>  	/* Need the config devices early, before the "normal" devices... */
>  	for_each_compatible_node(node, NULL, "arm,vexpress,config-bus") {
>  		err = vexpress_config_populate(node);
> -		if (err)
> +		if (err) {
> +			of_node_put(node);
>  			break;
> +		}

This automatically generated patch only solves half of the problem (for the error
path).

>  	}
>  
>  	return err;
> -- 
> 1.9.1
> 

I feel that a better patch would be the following, where the node is released
regardless of the result of vexpress_config_populate().

--8<--------------------------------------------------------------------------
diff --git a/drivers/bus/vexpress-config.c b/drivers/bus/vexpress-config.c
index 6575c0f..c57453d 100644
--- a/drivers/bus/vexpress-config.c
+++ b/drivers/bus/vexpress-config.c
@@ -192,6 +192,7 @@ static int __init vexpress_config_init(void)
 	/* Need the config devices early, before the "normal" devices... */
 	for_each_compatible_node(node, NULL, "arm,vexpress,config-bus") {
 		err = vexpress_config_populate(node);
+		of_node_put(node);
 		if (err)
 			break;
 	}
-->8--------------------------------------------------------------------------

Best regards,
Liviu

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ?\_(?)_/?

  reply	other threads:[~2016-01-25 12:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-22 18:08 [PATCH] bus: vexpress-config: Add missing of_node_put Amitoj Kaur Chawla
2016-01-25 12:17 ` liviu.dudau at arm.com [this message]
2016-01-25 12:24   ` Julia Lawall
2016-01-25 12:51     ` liviu.dudau at arm.com

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160125121720.GC1194@e106497-lin.cambridge.arm.com \
    --to=liviu.dudau@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox