2009-11-21 21:18:42

by Julia Lawall

Subject: [PATCH] drivers/regulator: use PTR_ERR to get error code

From: Julia Lawall <[email protected]>

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 <[email protected]>

---
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;

2009-11-21 21:33:13

by Mark Brown

Subject: Re: [PATCH] drivers/regulator: use PTR_ERR to get error code

On 21 Nov 2009, at 21:18, Julia Lawall <[email protected]> wrote:

> From: Julia Lawall <[email protected]>
>
> 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 <[email protected]>

Acked-by: <[email protected]>

>
> ---
> 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;

2009-11-23 11:01:21

by Liam Girdwood

Subject: Re: [PATCH] drivers/regulator: use PTR_ERR to get error code

On Sat, 2009-11-21 at 22:18 +0100, Julia Lawall wrote:
> From: Julia Lawall <[email protected]>
>
> 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 <[email protected]>
>

Applied.

Thanks

Liam