* [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code
@ 2012-09-06 15:23 Peter Senna Tschudin
2012-09-23 19:34 ` Fwd: " Mauro Carvalho Chehab
0 siblings, 1 reply; 4+ messages in thread
From: Peter Senna Tschudin @ 2012-09-06 15:23 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: kernel-janitors, Julia.Lawall, linux-media, linux-kernel
From: Peter Senna Tschudin <peter.senna@gmail.com>
Convert a nonnegative error return code 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: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/platform/soc_camera/mx2_camera.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 256187f..f8884a7 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1800,13 +1800,16 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
if (!res_emma || !irq_emma) {
dev_err(&pdev->dev, "no EMMA resources\n");
+ err = -ENODEV;
goto exit_free_irq;
}
pcdev->res_emma = res_emma;
pcdev->irq_emma = irq_emma;
- if (mx27_camera_emma_init(pcdev))
+ if (mx27_camera_emma_init(pcdev)) {
+ err = -ENODEV;
goto exit_free_irq;
+ }
}
pcdev->soc_host.drv_name = MX2_CAM_DRV_NAME,
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Fwd: [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code
2012-09-06 15:23 [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code Peter Senna Tschudin
@ 2012-09-23 19:34 ` Mauro Carvalho Chehab
2012-09-23 21:15 ` Guennadi Liakhovetski
0 siblings, 1 reply; 4+ messages in thread
From: Mauro Carvalho Chehab @ 2012-09-23 19:34 UTC (permalink / raw)
To: Guennadi Liakhovetski, kernel-janitors, Julia.Lawall,
linux-media, linux-kernel, Peter Senna Tschudin
[-- Attachment #1: Type: text/plain, Size: 1960 bytes --]
Please review,
Regards,
Mauro.
-------- Mensagem original --------
Assunto: [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code
Data: Thu, 6 Sep 2012 17:23:59 +0200
De: Peter Senna Tschudin <peter.senna@gmail.com>
Para: Mauro Carvalho Chehab <mchehab@infradead.org>
CC: kernel-janitors@vger.kernel.org, Julia.Lawall@lip6.fr, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
From: Peter Senna Tschudin <peter.senna@gmail.com>
Convert a nonnegative error return code 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: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/platform/soc_camera/mx2_camera.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 256187f..f8884a7 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1800,13 +1800,16 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
if (!res_emma || !irq_emma) {
dev_err(&pdev->dev, "no EMMA resources\n");
+ err = -ENODEV;
goto exit_free_irq;
}
pcdev->res_emma = res_emma;
pcdev->irq_emma = irq_emma;
- if (mx27_camera_emma_init(pcdev))
+ if (mx27_camera_emma_init(pcdev)) {
+ err = -ENODEV;
goto exit_free_irq;
+ }
}
pcdev->soc_host.drv_name = MX2_CAM_DRV_NAME,
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: Seção da mensagem anexada --]
[-- Type: text/plain, Size: 0 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Fwd: [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code
2012-09-23 19:34 ` Fwd: " Mauro Carvalho Chehab
@ 2012-09-23 21:15 ` Guennadi Liakhovetski
2012-09-24 9:11 ` [PATCH V2 " Peter Senna Tschudin
0 siblings, 1 reply; 4+ messages in thread
From: Guennadi Liakhovetski @ 2012-09-23 21:15 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: kernel-janitors, Julia.Lawall, linux-media, linux-kernel,
Peter Senna Tschudin
Hi Peter
Thanks for the patch, but I think it can be improved:
On Sun, 23 Sep 2012, Mauro Carvalho Chehab wrote:
> Please review,
>
> Regards,
> Mauro.
>
>
> -------- Mensagem original --------
> Assunto: [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code
> Data: Thu, 6 Sep 2012 17:23:59 +0200
> De: Peter Senna Tschudin <peter.senna@gmail.com>
> Para: Mauro Carvalho Chehab <mchehab@infradead.org>
> CC: kernel-janitors@vger.kernel.org, Julia.Lawall@lip6.fr, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
>
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Convert a nonnegative error return code 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: Peter Senna Tschudin <peter.senna@gmail.com>
>
> ---
> drivers/media/platform/soc_camera/mx2_camera.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
> index 256187f..f8884a7 100644
> --- a/drivers/media/platform/soc_camera/mx2_camera.c
> +++ b/drivers/media/platform/soc_camera/mx2_camera.c
> @@ -1800,13 +1800,16 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
>
> if (!res_emma || !irq_emma) {
> dev_err(&pdev->dev, "no EMMA resources\n");
> + err = -ENODEV;
> goto exit_free_irq;
> }
>
> pcdev->res_emma = res_emma;
> pcdev->irq_emma = irq_emma;
> - if (mx27_camera_emma_init(pcdev))
> + if (mx27_camera_emma_init(pcdev)) {
> + err = -ENODEV;
I think, propagating the error, returned by mx27_camera_emma_init() to the
caller would be better, than using -ENODEV.
Thanks
Guennadi
> goto exit_free_irq;
> + }
> }
>
> pcdev->soc_host.drv_name = MX2_CAM_DRV_NAME,
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH V2 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code
2012-09-23 21:15 ` Guennadi Liakhovetski
@ 2012-09-24 9:11 ` Peter Senna Tschudin
0 siblings, 0 replies; 4+ messages in thread
From: Peter Senna Tschudin @ 2012-09-24 9:11 UTC (permalink / raw)
To: mchehab
Cc: g.liakhovetski, laurent.pinchart, fabio.estevam, linux-media,
linux-kernel, kernel-janitors, Peter Senna Tschudin
From: Peter Senna Tschudin <peter.senna@gmail.com>
Convert a nonnegative error return code 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: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/platform/soc_camera/mx2_camera.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 256187f..01d7c11 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1800,12 +1800,14 @@ static int __devinit mx2_camera_probe(struct platform_device *pdev)
if (!res_emma || !irq_emma) {
dev_err(&pdev->dev, "no EMMA resources\n");
+ err = -ENODEV;
goto exit_free_irq;
}
pcdev->res_emma = res_emma;
pcdev->irq_emma = irq_emma;
- if (mx27_camera_emma_init(pcdev))
+ err = mx27_camera_emma_init(pcdev);
+ if (err)
goto exit_free_irq;
}
--
1.7.11.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-09-24 9:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-06 15:23 [PATCH 2/14] drivers/media/platform/soc_camera/mx2_camera.c: fix error return code Peter Senna Tschudin
2012-09-23 19:34 ` Fwd: " Mauro Carvalho Chehab
2012-09-23 21:15 ` Guennadi Liakhovetski
2012-09-24 9:11 ` [PATCH V2 " Peter Senna Tschudin
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).