All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] mfd: menelaus: fix error return code
@ 2014-08-06 20:12 ` Julia Lawall
  0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2014-08-06 20:12 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: kernel-janitors, Lee Jones, linux-kernel

From: Julia Lawall <Julia.Lawall@lip6.fr>

Convert a zero return value on error to a negative one, as returned
elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/mfd/menelaus.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 5e2667a..16070d8 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1240,8 +1240,10 @@ static int menelaus_probe(struct i2c_client *client,
 	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
 
 	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
-	if (val < 0)
+	if (val < 0) {
+		err = val;
 		goto fail;
+	}
 	if (val & (1 << 7))
 		menelaus->vcore_hw_mode = 1;
 	else


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH 1/4] mfd: menelaus: fix error return code
@ 2014-08-06 20:12 ` Julia Lawall
  0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2014-08-06 20:12 UTC (permalink / raw)
  To: Samuel Ortiz; +Cc: kernel-janitors, Lee Jones, linux-kernel

From: Julia Lawall <Julia.Lawall@lip6.fr>

Convert a zero return value on error to a negative one, as returned
elsewhere in the function.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
 drivers/mfd/menelaus.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 5e2667a..16070d8 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1240,8 +1240,10 @@ static int menelaus_probe(struct i2c_client *client,
 	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
 
 	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
-	if (val < 0)
+	if (val < 0) {
+		err = val;
 		goto fail;
+	}
 	if (val & (1 << 7))
 		menelaus->vcore_hw_mode = 1;
 	else


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
  2014-08-06 20:12 ` Julia Lawall
@ 2014-08-21  8:26   ` Lee Jones
  -1 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-08-21  8:26 UTC (permalink / raw)
  To: Julia Lawall; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel

On Wed, 06 Aug 2014, Julia Lawall wrote:

> From: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
> 
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> (
> if@p1 (\(ret < 0\|ret != 0\))
>  { ... return ret; }
> |
> ret@p1 = 0
> )
> ... when != ret = e1
>     when != &ret
> *if(...)
> {
>   ... when != ret = e2
>       when forall
>  return ret;
> }
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---
>  drivers/mfd/menelaus.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
> index 5e2667a..16070d8 100644
> --- a/drivers/mfd/menelaus.c
> +++ b/drivers/mfd/menelaus.c
> @@ -1240,8 +1240,10 @@ static int menelaus_probe(struct i2c_client *client,
>  	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
>  
>  	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
> -	if (val < 0)
> +	if (val < 0) {
> +		err = val;
>  		goto fail;
> +	}

I'd prefer it if you could s/val/err and remove val altogether.  While
you're there, if you can s/(1 << 7)/BIT(7), that would be great
too.  If you don't have time, or just don't want to do it, I will be
happy to submit a patch instead with your Reported-by.  Your call.

>  	if (val & (1 << 7))
>  		menelaus->vcore_hw_mode = 1;
>  	else
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
@ 2014-08-21  8:26   ` Lee Jones
  0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-08-21  8:26 UTC (permalink / raw)
  To: Julia Lawall; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel

On Wed, 06 Aug 2014, Julia Lawall wrote:

> From: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
> 
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> (
> if@p1 (\(ret < 0\|ret != 0\))
>  { ... return ret; }
> |
> ret@p1 = 0
> )
> ... when != ret = e1
>     when != &ret
> *if(...)
> {
>   ... when != ret = e2
>       when forall
>  return ret;
> }
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---
>  drivers/mfd/menelaus.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
> index 5e2667a..16070d8 100644
> --- a/drivers/mfd/menelaus.c
> +++ b/drivers/mfd/menelaus.c
> @@ -1240,8 +1240,10 @@ static int menelaus_probe(struct i2c_client *client,
>  	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
>  
>  	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
> -	if (val < 0)
> +	if (val < 0) {
> +		err = val;
>  		goto fail;
> +	}

I'd prefer it if you could s/val/err and remove val altogether.  While
you're there, if you can s/(1 << 7)/BIT(7), that would be great
too.  If you don't have time, or just don't want to do it, I will be
happy to submit a patch instead with your Reported-by.  Your call.

>  	if (val & (1 << 7))
>  		menelaus->vcore_hw_mode = 1;
>  	else
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
  2014-08-21  8:26   ` Lee Jones
@ 2014-08-21 10:18     ` Julia Lawall
  -1 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2014-08-21 10:18 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel



On Thu, 21 Aug 2014, Lee Jones wrote:

> On Wed, 06 Aug 2014, Julia Lawall wrote:
>
> > From: Julia Lawall <Julia.Lawall@lip6.fr>
> >
> > Convert a zero return value on error to a negative one, as returned
> > elsewhere in the function.
> >
> > A simplified version of the semantic match that finds this problem is as
> > follows: (http://coccinelle.lip6.fr/)
> >
> > // <smpl>
> > (
> > if@p1 (\(ret < 0\|ret != 0\))
> >  { ... return ret; }
> > |
> > ret@p1 = 0
> > )
> > ... when != ret = e1
> >     when != &ret
> > *if(...)
> > {
> >   ... when != ret = e2
> >       when forall
> >  return ret;
> > }
> >
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> >
> > ---
> >  drivers/mfd/menelaus.c |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
> > index 5e2667a..16070d8 100644
> > --- a/drivers/mfd/menelaus.c
> > +++ b/drivers/mfd/menelaus.c
> > @@ -1240,8 +1240,10 @@ static int menelaus_probe(struct i2c_client *client,
> >  	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
> >
> >  	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
> > -	if (val < 0)
> > +	if (val < 0) {
> > +		err = val;
> >  		goto fail;
> > +	}
>
> I'd prefer it if you could s/val/err and remove val altogether.  While
> you're there, if you can s/(1 << 7)/BIT(7), that would be great
> too.  If you don't have time, or just don't want to do it, I will be
> happy to submit a patch instead with your Reported-by.  Your call.
>
> >  	if (val & (1 << 7))
> >  		menelaus->vcore_hw_mode = 1;
> >  	else
> >

I will look into it.  Thanks for the feedback.

julia

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
@ 2014-08-21 10:18     ` Julia Lawall
  0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2014-08-21 10:18 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel



On Thu, 21 Aug 2014, Lee Jones wrote:

> On Wed, 06 Aug 2014, Julia Lawall wrote:
>
> > From: Julia Lawall <Julia.Lawall@lip6.fr>
> >
> > Convert a zero return value on error to a negative one, as returned
> > elsewhere in the function.
> >
> > A simplified version of the semantic match that finds this problem is as
> > follows: (http://coccinelle.lip6.fr/)
> >
> > // <smpl>
> > (
> > if@p1 (\(ret < 0\|ret != 0\))
> >  { ... return ret; }
> > |
> > ret@p1 = 0
> > )
> > ... when != ret = e1
> >     when != &ret
> > *if(...)
> > {
> >   ... when != ret = e2
> >       when forall
> >  return ret;
> > }
> >
> > // </smpl>
> >
> > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> >
> > ---
> >  drivers/mfd/menelaus.c |    4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
> > index 5e2667a..16070d8 100644
> > --- a/drivers/mfd/menelaus.c
> > +++ b/drivers/mfd/menelaus.c
> > @@ -1240,8 +1240,10 @@ static int menelaus_probe(struct i2c_client *client,
> >  	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);
> >
> >  	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
> > -	if (val < 0)
> > +	if (val < 0) {
> > +		err = val;
> >  		goto fail;
> > +	}
>
> I'd prefer it if you could s/val/err and remove val altogether.  While
> you're there, if you can s/(1 << 7)/BIT(7), that would be great
> too.  If you don't have time, or just don't want to do it, I will be
> happy to submit a patch instead with your Reported-by.  Your call.
>
> >  	if (val & (1 << 7))
> >  		menelaus->vcore_hw_mode = 1;
> >  	else
> >

I will look into it.  Thanks for the feedback.

julia

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
  2014-08-21  8:26   ` Lee Jones
@ 2014-08-21 12:06     ` Julia Lawall
  -1 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2014-08-21 12:06 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel

Convert a zero return value on error to a negative one, as returned
elsewhere in the function.

Additionally, converted 1 << 7 to BIT(7) at the suggestion of Lee Jones.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
v2: Drop the name "val" and use BIT(7).

 drivers/mfd/menelaus.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 5e2667a..dd3e28d 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1186,7 +1186,7 @@ static int menelaus_probe(struct i2c_client *client,
 			  const struct i2c_device_id *id)
 {
 	struct menelaus_chip	*menelaus;
-	int			rev = 0, val;
+	int			rev = 0;
 	int			err = 0;
 	struct menelaus_platform_data *menelaus_pdata =
 					dev_get_platdata(&client->dev);
@@ -1239,10 +1239,10 @@ static int menelaus_probe(struct i2c_client *client,

 	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);

-	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
-	if (val < 0)
+	err = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
+	if (err < 0)
 		goto fail;
-	if (val & (1 << 7))
+	if (err & BIT(7))
 		menelaus->vcore_hw_mode = 1;
 	else
 		menelaus->vcore_hw_mode = 0;

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
@ 2014-08-21 12:06     ` Julia Lawall
  0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2014-08-21 12:06 UTC (permalink / raw)
  To: Lee Jones; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel

Convert a zero return value on error to a negative one, as returned
elsewhere in the function.

Additionally, converted 1 << 7 to BIT(7) at the suggestion of Lee Jones.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
(
if@p1 (\(ret < 0\|ret != 0\))
 { ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
    when != &ret
*if(...)
{
  ... when != ret = e2
      when forall
 return ret;
}

// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

---
v2: Drop the name "val" and use BIT(7).

 drivers/mfd/menelaus.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 5e2667a..dd3e28d 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -1186,7 +1186,7 @@ static int menelaus_probe(struct i2c_client *client,
 			  const struct i2c_device_id *id)
 {
 	struct menelaus_chip	*menelaus;
-	int			rev = 0, val;
+	int			rev = 0;
 	int			err = 0;
 	struct menelaus_platform_data *menelaus_pdata  					dev_get_platdata(&client->dev);
@@ -1239,10 +1239,10 @@ static int menelaus_probe(struct i2c_client *client,

 	pr_info("Menelaus rev %d.%d\n", rev >> 4, rev & 0x0f);

-	val = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
-	if (val < 0)
+	err = menelaus_read_reg(MENELAUS_VCORE_CTRL1);
+	if (err < 0)
 		goto fail;
-	if (val & (1 << 7))
+	if (err & BIT(7))
 		menelaus->vcore_hw_mode = 1;
 	else
 		menelaus->vcore_hw_mode = 0;

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
  2014-08-21 12:06     ` Julia Lawall
@ 2014-08-21 12:13       ` Lee Jones
  -1 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-08-21 12:13 UTC (permalink / raw)
  To: Julia Lawall; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel

On Thu, 21 Aug 2014, Julia Lawall wrote:

> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
> 
> Additionally, converted 1 << 7 to BIT(7) at the suggestion of Lee Jones.
> 
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> (
> if@p1 (\(ret < 0\|ret != 0\))
>  { ... return ret; }
> |
> ret@p1 = 0
> )
> ... when != ret = e1
>     when != &ret
> *if(...)
> {
>   ... when != ret = e2
>       when forall
>  return ret;
> }
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---
> v2: Drop the name "val" and use BIT(7).

Thanks Julia.  Patch applied.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] mfd: menelaus: fix error return code
@ 2014-08-21 12:13       ` Lee Jones
  0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2014-08-21 12:13 UTC (permalink / raw)
  To: Julia Lawall; +Cc: Samuel Ortiz, kernel-janitors, linux-kernel

On Thu, 21 Aug 2014, Julia Lawall wrote:

> Convert a zero return value on error to a negative one, as returned
> elsewhere in the function.
> 
> Additionally, converted 1 << 7 to BIT(7) at the suggestion of Lee Jones.
> 
> A simplified version of the semantic match that finds this problem is as
> follows: (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> (
> if@p1 (\(ret < 0\|ret != 0\))
>  { ... return ret; }
> |
> ret@p1 = 0
> )
> ... when != ret = e1
>     when != &ret
> *if(...)
> {
>   ... when != ret = e2
>       when forall
>  return ret;
> }
> 
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> 
> ---
> v2: Drop the name "val" and use BIT(7).

Thanks Julia.  Patch applied.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-08-21 12:14 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-06 20:12 [PATCH 1/4] mfd: menelaus: fix error return code Julia Lawall
2014-08-06 20:12 ` Julia Lawall
2014-08-21  8:26 ` Lee Jones
2014-08-21  8:26   ` Lee Jones
2014-08-21 10:18   ` Julia Lawall
2014-08-21 10:18     ` Julia Lawall
2014-08-21 12:06   ` Julia Lawall
2014-08-21 12:06     ` Julia Lawall
2014-08-21 12:13     ` Lee Jones
2014-08-21 12:13       ` Lee Jones

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.