* [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code
@ 2012-09-07 13:38 ` Peter Senna Tschudin
0 siblings, 0 replies; 4+ messages in thread
From: Peter Senna Tschudin @ 2012-09-07 13:38 UTC (permalink / raw)
To: linux-kernel; +Cc: kernel-janitors
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/pci/cx25821/cx25821-video-upstream-ch2.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
index c8c94fb..273df94 100644
--- a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
@@ -704,7 +704,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
{
struct sram_channel *sram_ch;
u32 tmp;
- int retval = 0;
int err = 0;
int data_frame_size = 0;
int risc_buffer_size = 0;
@@ -749,15 +748,19 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
str_length + 1, GFP_KERNEL);
- if (!dev->_filename_ch2)
+ if (!dev->_filename_ch2) {
+ err = -ENOENT;
goto error;
+ }
} else {
str_length = strlen(dev->_defaultname_ch2);
dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,
str_length + 1, GFP_KERNEL);
- if (!dev->_filename_ch2)
+ if (!dev->_filename_ch2) {
+ err = -ENOENT;
goto error;
+ }
}
/* Default if filename is empty string */
@@ -773,7 +776,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
}
}
- retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,
+ err = cx25821_sram_channel_setup_upstream(dev, sram_ch,
dev->_line_size_ch2, 0);
/* setup fifo + format */
@@ -783,9 +786,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
dev->upstream_databuf_size_ch2 = data_frame_size * 2;
/* Allocating buffers and prepare RISC program */
- retval = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
+ err = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
dev->_line_size_ch2);
- if (retval < 0) {
+ if (err < 0) {
pr_err("%s: Failed to set up Video upstream buffers!\n",
dev->name);
goto error;
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code
@ 2012-09-07 13:38 ` Peter Senna Tschudin
0 siblings, 0 replies; 4+ messages in thread
From: Peter Senna Tschudin @ 2012-09-07 13:38 UTC (permalink / raw)
To: linux-kernel; +Cc: kernel-janitors
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/pci/cx25821/cx25821-video-upstream-ch2.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
index c8c94fb..273df94 100644
--- a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
@@ -704,7 +704,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
{
struct sram_channel *sram_ch;
u32 tmp;
- int retval = 0;
int err = 0;
int data_frame_size = 0;
int risc_buffer_size = 0;
@@ -749,15 +748,19 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
str_length + 1, GFP_KERNEL);
- if (!dev->_filename_ch2)
+ if (!dev->_filename_ch2) {
+ err = -ENOENT;
goto error;
+ }
} else {
str_length = strlen(dev->_defaultname_ch2);
dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,
str_length + 1, GFP_KERNEL);
- if (!dev->_filename_ch2)
+ if (!dev->_filename_ch2) {
+ err = -ENOENT;
goto error;
+ }
}
/* Default if filename is empty string */
@@ -773,7 +776,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
}
}
- retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,
+ err = cx25821_sram_channel_setup_upstream(dev, sram_ch,
dev->_line_size_ch2, 0);
/* setup fifo + format */
@@ -783,9 +786,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
dev->upstream_databuf_size_ch2 = data_frame_size * 2;
/* Allocating buffers and prepare RISC program */
- retval = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
+ err = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
dev->_line_size_ch2);
- if (retval < 0) {
+ if (err < 0) {
pr_err("%s: Failed to set up Video upstream buffers!\n",
dev->name);
goto error;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return c
2012-09-07 13:38 ` Peter Senna Tschudin
@ 2012-09-07 15:26 ` walter harms
-1 siblings, 0 replies; 4+ messages in thread
From: walter harms @ 2012-09-07 15:26 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: linux-kernel, kernel-janitors
Am 07.09.2012 15:38, schrieb 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/pci/cx25821/cx25821-video-upstream-ch2.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> index c8c94fb..273df94 100644
> --- a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> +++ b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> @@ -704,7 +704,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> {
> struct sram_channel *sram_ch;
> u32 tmp;
> - int retval = 0;
> int err = 0;
> int data_frame_size = 0;
> int risc_buffer_size = 0;
> @@ -749,15 +748,19 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
> str_length + 1, GFP_KERNEL);
>
> - if (!dev->_filename_ch2)
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> goto error;
> + }
> } else {
> str_length = strlen(dev->_defaultname_ch2);
> dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,
> str_length + 1, GFP_KERNEL);
>
> - if (!dev->_filename_ch2)
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> goto error;
> + }
> }
>
This should be done properly:
if (dev->input_filename_ch2)
strÞv->input_filename_ch2;
else
strÞv->_defaultname_ch2;
dev->_filename_ch2=kstrdup(str,GFP_KERNEL);
if (!dev->_filename_ch2) {
err = -ENOENT;
goto error;
}
hope that helps
re,
wh
> /* Default if filename is empty string */
> @@ -773,7 +776,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> }
> }
>
> - retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,
> + err = cx25821_sram_channel_setup_upstream(dev, sram_ch,
> dev->_line_size_ch2, 0);
>
> /* setup fifo + format */
> @@ -783,9 +786,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> dev->upstream_databuf_size_ch2 = data_frame_size * 2;
>
> /* Allocating buffers and prepare RISC program */
> - retval = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
> + err = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
> dev->_line_size_ch2);
> - if (retval < 0) {
> + if (err < 0) {
> pr_err("%s: Failed to set up Video upstream buffers!\n",
> dev->name);
> goto error;
>
> --
> 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
>
>
--
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] 4+ messages in thread* Re: [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code
@ 2012-09-07 15:26 ` walter harms
0 siblings, 0 replies; 4+ messages in thread
From: walter harms @ 2012-09-07 15:26 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: linux-kernel, kernel-janitors
Am 07.09.2012 15:38, schrieb 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/pci/cx25821/cx25821-video-upstream-ch2.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> index c8c94fb..273df94 100644
> --- a/../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> +++ b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> @@ -704,7 +704,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> {
> struct sram_channel *sram_ch;
> u32 tmp;
> - int retval = 0;
> int err = 0;
> int data_frame_size = 0;
> int risc_buffer_size = 0;
> @@ -749,15 +748,19 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
> str_length + 1, GFP_KERNEL);
>
> - if (!dev->_filename_ch2)
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> goto error;
> + }
> } else {
> str_length = strlen(dev->_defaultname_ch2);
> dev->_filename_ch2 = kmemdup(dev->_defaultname_ch2,
> str_length + 1, GFP_KERNEL);
>
> - if (!dev->_filename_ch2)
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> goto error;
> + }
> }
>
This should be done properly:
if (dev->input_filename_ch2)
str=dev->input_filename_ch2;
else
str=dev->_defaultname_ch2;
dev->_filename_ch2=kstrdup(str,GFP_KERNEL);
if (!dev->_filename_ch2) {
err = -ENOENT;
goto error;
}
hope that helps
re,
wh
> /* Default if filename is empty string */
> @@ -773,7 +776,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> }
> }
>
> - retval = cx25821_sram_channel_setup_upstream(dev, sram_ch,
> + err = cx25821_sram_channel_setup_upstream(dev, sram_ch,
> dev->_line_size_ch2, 0);
>
> /* setup fifo + format */
> @@ -783,9 +786,9 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> dev->upstream_databuf_size_ch2 = data_frame_size * 2;
>
> /* Allocating buffers and prepare RISC program */
> - retval = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
> + err = cx25821_upstream_buffer_prepare_ch2(dev, sram_ch,
> dev->_line_size_ch2);
> - if (retval < 0) {
> + if (err < 0) {
> pr_err("%s: Failed to set up Video upstream buffers!\n",
> dev->name);
> goto error;
>
> --
> 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] 4+ messages in thread
end of thread, other threads:[~2012-09-07 15:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-07 13:38 [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code Peter Senna Tschudin
2012-09-07 13:38 ` Peter Senna Tschudin
2012-09-07 15:26 ` [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return c walter harms
2012-09-07 15:26 ` [PATCH] ../linux-next/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code walter harms
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.