public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drivers/regulator: use PTR_ERR to get error code
@ 2009-11-21 21:18 Julia Lawall
  2009-11-21 21:33 ` Mark Brown
  2009-11-23 10:55 ` Liam Girdwood
  0 siblings, 2 replies; 3+ messages in thread
From: Julia Lawall @ 2009-11-21 21:18 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, linux-kernel, kernel-janitors

From: Julia Lawall <julia@diku.dk>

IS_ERR returns only 1 or 0.  The callsite of setup_regulators expects a
negative integer in an error case.  Thus, PTR_ERR has to be used to extract
it.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression E,E1;
@@

*E = IS_ERR(...)
 ... when != E = E1
*return E;
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>

---
 drivers/regulator/lp3971.c          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
index 7803a32..76d08c2 100644
--- a/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@ -446,8 +446,8 @@ static int setup_regulators(struct lp3971 *lp3971,
 		lp3971->rdev[i] = regulator_register(&regulators[id],
 			lp3971->dev, pdata->regulators[i].initdata, lp3971);
 
-		err = IS_ERR(lp3971->rdev[i]);
-		if (err) {
+		if (IS_ERR(lp3971->rdev[i])) {
+			err = PTR_ERR(lp3971->rdev[i]);
 			dev_err(lp3971->dev, "regulator init failed: %d\n",
 				err);
 			goto error;

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] drivers/regulator: use PTR_ERR to get error code
  2009-11-21 21:18 [PATCH] drivers/regulator: use PTR_ERR to get error code Julia Lawall
@ 2009-11-21 21:33 ` Mark Brown
  2009-11-23 10:55 ` Liam Girdwood
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2009-11-21 21:33 UTC (permalink / raw)
  To: Julia Lawall
  Cc: Liam Girdwood, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org

On 21 Nov 2009, at 21:18, Julia Lawall <julia@diku.dk> wrote:

> From: Julia Lawall <julia@diku.dk>
>
> IS_ERR returns only 1 or 0.  The callsite of setup_regulators  
> expects a
> negative integer in an error case.  Thus, PTR_ERR has to be used to  
> extract
> it.
>
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression E,E1;
> @@
>
> *E = IS_ERR(...)
> ... when != E = E1
> *return E;
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>

Acked-by: <broonie@opensource.wolfsonmicro.com>

>
> ---
> drivers/regulator/lp3971.c          |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c
> index 7803a32..76d08c2 100644
> --- a/drivers/regulator/lp3971.c
> +++ b/drivers/regulator/lp3971.c
> @@ -446,8 +446,8 @@ static int setup_regulators(struct lp3971 *lp3971,
>        lp3971->rdev[i] = regulator_register(&regulators[id],
>            lp3971->dev, pdata->regulators[i].initdata, lp3971);
>
> -        err = IS_ERR(lp3971->rdev[i]);
> -        if (err) {
> +        if (IS_ERR(lp3971->rdev[i])) {
> +            err = PTR_ERR(lp3971->rdev[i]);
>            dev_err(lp3971->dev, "regulator init failed: %d\n",
>                err);
>            goto error;

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] drivers/regulator: use PTR_ERR to get error code
  2009-11-21 21:18 [PATCH] drivers/regulator: use PTR_ERR to get error code Julia Lawall
  2009-11-21 21:33 ` Mark Brown
@ 2009-11-23 10:55 ` Liam Girdwood
  1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2009-11-23 10:55 UTC (permalink / raw)
  To: Julia Lawall; +Cc: Mark Brown, linux-kernel, kernel-janitors

On Sat, 2009-11-21 at 22:18 +0100, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> 
> IS_ERR returns only 1 or 0.  The callsite of setup_regulators expects a
> negative integer in an error case.  Thus, PTR_ERR has to be used to extract
> it.
> 
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@
> expression E,E1;
> @@
> 
> *E = IS_ERR(...)
>  ... when != E = E1
> *return E;
> // </smpl>
> 
> Signed-off-by: Julia Lawall <julia@diku.dk>
> 

Applied.

Thanks

Liam


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-11-23 10:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-21 21:18 [PATCH] drivers/regulator: use PTR_ERR to get error code Julia Lawall
2009-11-21 21:33 ` Mark Brown
2009-11-23 10:55 ` Liam Girdwood

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox