* [PATCH 4/4] drivers: video: fbdev: atmel_lcdfb.c: fix error return code
@ 2014-08-06 20:12 Julia Lawall
2014-08-11 10:25 ` Nicolas Ferre
2014-08-26 10:05 ` Tomi Valkeinen
0 siblings, 2 replies; 3+ messages in thread
From: Julia Lawall @ 2014-08-06 20:12 UTC (permalink / raw)
To: Nicolas Ferre
Cc: kernel-janitors, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, linux-fbdev, 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>
---
The error codes chosen are the ones that are commonly used elsewhere or
these functions. Perhaps something else is wanted.
drivers/video/fbdev/atmel_lcdfb.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index 92640d4..1d8bdb9 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -1102,12 +1102,14 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
timings = of_get_display_timings(display_np);
if (!timings) {
dev_err(dev, "failed to get display timings\n");
+ ret = -EINVAL;
goto put_display_node;
}
timings_np = of_find_node_by_name(display_np, "display-timings");
if (!timings_np) {
dev_err(dev, "failed to find display-timings node\n");
+ ret = -ENODEV;
goto put_display_node;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 4/4] drivers: video: fbdev: atmel_lcdfb.c: fix error return code
2014-08-06 20:12 [PATCH 4/4] drivers: video: fbdev: atmel_lcdfb.c: fix error return code Julia Lawall
@ 2014-08-11 10:25 ` Nicolas Ferre
2014-08-26 10:05 ` Tomi Valkeinen
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2014-08-11 10:25 UTC (permalink / raw)
To: Julia Lawall
Cc: kernel-janitors, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, linux-fbdev, linux-kernel
On 06/08/2014 22:12, Julia Lawall :
> 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>
Okay, seems good patch:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Thanks, best regards,
> ---
> The error codes chosen are the ones that are commonly used elsewhere or
> these functions. Perhaps something else is wanted.
>
> drivers/video/fbdev/atmel_lcdfb.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
> index 92640d4..1d8bdb9 100644
> --- a/drivers/video/fbdev/atmel_lcdfb.c
> +++ b/drivers/video/fbdev/atmel_lcdfb.c
> @@ -1102,12 +1102,14 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
> timings = of_get_display_timings(display_np);
> if (!timings) {
> dev_err(dev, "failed to get display timings\n");
> + ret = -EINVAL;
> goto put_display_node;
> }
>
> timings_np = of_find_node_by_name(display_np, "display-timings");
> if (!timings_np) {
> dev_err(dev, "failed to find display-timings node\n");
> + ret = -ENODEV;
> goto put_display_node;
> }
>
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 4/4] drivers: video: fbdev: atmel_lcdfb.c: fix error return code
2014-08-06 20:12 [PATCH 4/4] drivers: video: fbdev: atmel_lcdfb.c: fix error return code Julia Lawall
2014-08-11 10:25 ` Nicolas Ferre
@ 2014-08-26 10:05 ` Tomi Valkeinen
1 sibling, 0 replies; 3+ messages in thread
From: Tomi Valkeinen @ 2014-08-26 10:05 UTC (permalink / raw)
To: Julia Lawall, Nicolas Ferre
Cc: kernel-janitors, Jean-Christophe Plagniol-Villard, linux-fbdev,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]
On 06/08/14 23:12, 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>
>
> ---
> The error codes chosen are the ones that are commonly used elsewhere or
> these functions. Perhaps something else is wanted.
>
> drivers/video/fbdev/atmel_lcdfb.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
> index 92640d4..1d8bdb9 100644
> --- a/drivers/video/fbdev/atmel_lcdfb.c
> +++ b/drivers/video/fbdev/atmel_lcdfb.c
> @@ -1102,12 +1102,14 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
> timings = of_get_display_timings(display_np);
> if (!timings) {
> dev_err(dev, "failed to get display timings\n");
> + ret = -EINVAL;
> goto put_display_node;
> }
>
> timings_np = of_find_node_by_name(display_np, "display-timings");
> if (!timings_np) {
> dev_err(dev, "failed to find display-timings node\n");
> + ret = -ENODEV;
> goto put_display_node;
> }
>
>
Thanks, queued for 3.17 fbdev fixes.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-26 10:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-06 20:12 [PATCH 4/4] drivers: video: fbdev: atmel_lcdfb.c: fix error return code Julia Lawall
2014-08-11 10:25 ` Nicolas Ferre
2014-08-26 10:05 ` Tomi Valkeinen
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).