LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Amit Kucheria <amit.kucheria@canonical.com>
To: Julia Lawall <julia@diku.dk>
Cc: "Evgeniy Polyakov" <johnpol@2ka.mipt.ru>,
	kernel-janitors@vger.kernel.org,
	"Tony Lindgren" <tony@atomide.com>,
	"Andrew Morton" <akpm@linux-foundation.org>,
	"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Tejun Heo" <tj@kernel.org>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/w1/masters/omap_hdq.c: Add missing clk_put
Date: Mon, 7 Feb 2011 09:59:33 +0200	[thread overview]
Message-ID: <20110207075933.GA2723@matterhorn.lan> (raw)
In-Reply-To: <1296754667-18049-1-git-send-email-julia@diku.dk>

On 11 Feb 03, Julia Lawall wrote:
> This code makes two calls to clk_get, then test both return values
> and fails if either failed.  The problem is that in the first inner if,
> where the first call to clk_get has failed, it don't know if the second
> call has failed as well.  So it don't know whether clk_get should be called
> on the result of the second call.  Of course, it would be possible to test
> that value again.  A simpler solution is just to test the result of calling
> clk_get directly after each call.
> 
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @r@
> position p1,p2;
> expression e;
> statement S;
> @@
> 
> e = clk_get@p1(...)
> ...
> if@p2 (IS_ERR(e)) S
> 
> @@
> expression e;
> statement S;
> identifier l;
> position r.p1, p2 != r.p2;
> @@
> 
> *e = clk_get@p1(...)
> ... when != clk_put(e)
> *if@p2 (...)
> {
>   ... when != clk_put(e)
> * return ...;
> }// </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>

Makes the code easier to read.

Acked-by: Amit Kucheria <amit.kucheria@canonical.com>

> ---
>  drivers/w1/masters/omap_hdq.c |   28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
> index 3a7e9ff..38e96ab 100644
> --- a/drivers/w1/masters/omap_hdq.c
> +++ b/drivers/w1/masters/omap_hdq.c
> @@ -593,19 +593,17 @@ static int __devinit omap_hdq_probe(struct platform_device *pdev)
>  
>  	/* get interface & functional clock objects */
>  	hdq_data->hdq_ick = clk_get(&pdev->dev, "ick");
> -	hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
> +	if (IS_ERR(hdq_data->hdq_ick)) {
> +		dev_dbg(&pdev->dev, "Can't get HDQ ick clock object\n");
> +		ret = PTR_ERR(hdq_data->hdq_ick);
> +		goto err_ick;
> +	}
>  
> -	if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) {
> -		dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n");
> -		if (IS_ERR(hdq_data->hdq_ick)) {
> -			ret = PTR_ERR(hdq_data->hdq_ick);
> -			goto err_clk;
> -		}
> -		if (IS_ERR(hdq_data->hdq_fck)) {
> -			ret = PTR_ERR(hdq_data->hdq_fck);
> -			clk_put(hdq_data->hdq_ick);
> -			goto err_clk;
> -		}
> +	hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
> +	if (IS_ERR(hdq_data->hdq_fck)) {
> +		dev_dbg(&pdev->dev, "Can't get HDQ fck clock object\n");
> +		ret = PTR_ERR(hdq_data->hdq_fck);
> +		goto err_fck;
>  	}
>  
>  	hdq_data->hdq_usecount = 0;
> @@ -665,10 +663,12 @@ err_fnclk:
>  	clk_disable(hdq_data->hdq_ick);
>  
>  err_intfclk:
> -	clk_put(hdq_data->hdq_ick);
>  	clk_put(hdq_data->hdq_fck);
>  
> -err_clk:
> +err_fck:
> +	clk_put(hdq_data->hdq_ick);
> +
> +err_ick:
>  	iounmap(hdq_data->hdq_base);
>  
>  err_ioremap:
> 

-- 
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || amit.kucheria@canonical.com
----------------------------------------------------------------------

  reply	other threads:[~2011-02-07  7:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-03 17:37 Julia Lawall
2011-02-07  7:59 ` Amit Kucheria [this message]
2011-02-10  3:13   ` Tony Lindgren

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=20110207075933.GA2723@matterhorn.lan \
    --to=amit.kucheria@canonical.com \
    --cc=akpm@linux-foundation.org \
    --cc=johnpol@2ka.mipt.ru \
    --cc=julia@diku.dk \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tj@kernel.org \
    --cc=tony@atomide.com \
    --cc=u.kleine-koenig@pengutronix.de \
    --subject='Re: [PATCH] drivers/w1/masters/omap_hdq.c: Add missing clk_put' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).