* [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code
@ 2012-09-07 13:46 ` Peter Senna Tschudin
0 siblings, 0 replies; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-07 13:46 UTC (permalink / raw)
To: linux-kernel, linux-media; +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] 6+ messages in thread
* [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code
@ 2012-09-07 13:46 ` Peter Senna Tschudin
0 siblings, 0 replies; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-07 13:46 UTC (permalink / raw)
To: linux-kernel, linux-media; +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] 6+ messages in thread
* [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup
2012-09-07 13:46 ` Peter Senna Tschudin
@ 2012-09-10 12:45 ` Peter Senna Tschudin
-1 siblings, 0 replies; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-10 12:45 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: kernel-janitors, linux-media, linux-kernel
From: Peter Senna Tschudin <peter.senna@gmail.com>
Replace kmemdup for kstrdup and cleaning up the code.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
It depends on the patch http://patchwork.linuxtv.org/patch/14231/
tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
index 273df94..b663dac 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
+++ b/tmp/cx25821-video-upstream-ch2.c
@@ -707,7 +707,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
int err = 0;
int data_frame_size = 0;
int risc_buffer_size = 0;
- int str_length = 0;
if (dev->_is_running_ch2) {
pr_info("Video Channel is still running so return!\n");
@@ -743,24 +742,16 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
risc_buffer_size = dev->_isNTSC_ch2 ?
NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
- if (dev->input_filename_ch2) {
- str_length = strlen(dev->input_filename_ch2);
- dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
- str_length + 1, GFP_KERNEL);
-
- 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->input_filename_ch2)
+ dev->_filename_ch2 = kstrdup(dev->input_filename_ch2,
+ GFP_KERNEL);
+ else
+ dev->_filename_ch2 = kstrdup(dev->_defaultname_ch2,
+ GFP_KERNEL);
- if (!dev->_filename_ch2) {
- err = -ENOENT;
- goto error;
- }
+ if (!dev->_filename_ch2) {
+ err = -ENOENT;
+ goto error;
}
/* Default if filename is empty string */
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup
@ 2012-09-10 12:45 ` Peter Senna Tschudin
0 siblings, 0 replies; 6+ messages in thread
From: Peter Senna Tschudin @ 2012-09-10 12:45 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: kernel-janitors, linux-media, linux-kernel
From: Peter Senna Tschudin <peter.senna@gmail.com>
Replace kmemdup for kstrdup and cleaning up the code.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
It depends on the patch http://patchwork.linuxtv.org/patch/14231/
tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
index 273df94..b663dac 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
+++ b/tmp/cx25821-video-upstream-ch2.c
@@ -707,7 +707,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
int err = 0;
int data_frame_size = 0;
int risc_buffer_size = 0;
- int str_length = 0;
if (dev->_is_running_ch2) {
pr_info("Video Channel is still running so return!\n");
@@ -743,24 +742,16 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
risc_buffer_size = dev->_isNTSC_ch2 ?
NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
- if (dev->input_filename_ch2) {
- str_length = strlen(dev->input_filename_ch2);
- dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
- str_length + 1, GFP_KERNEL);
-
- 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->input_filename_ch2)
+ dev->_filename_ch2 = kstrdup(dev->input_filename_ch2,
+ GFP_KERNEL);
+ else
+ dev->_filename_ch2 = kstrdup(dev->_defaultname_ch2,
+ GFP_KERNEL);
- if (!dev->_filename_ch2) {
- err = -ENOENT;
- goto error;
- }
+ if (!dev->_filename_ch2) {
+ err = -ENOENT;
+ goto error;
}
/* Default if filename is empty string */
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup
2012-09-10 12:45 ` Peter Senna Tschudin
@ 2012-09-23 20:29 ` Mauro Carvalho Chehab
-1 siblings, 0 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2012-09-23 20:29 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: kernel-janitors, linux-media, linux-kernel
Em Mon, 10 Sep 2012 14:45:54 +0200
Peter Senna Tschudin <peter.senna@gmail.com> escreveu:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Replace kmemdup for kstrdup and cleaning up the code.
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Maintainers/interested parties not copied. Also:
Hunk #1 succeeded at 708 (offset 1 line).
Hunk #2 FAILED at 742.
1 out of 2 hunks FAILED -- saving rejects to file drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c.rej
tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
>
> ---
> It depends on the patch http://patchwork.linuxtv.org/patch/14231/
>
> tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
> 1 file changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> index 273df94..b663dac 100644
> --- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> +++ b/tmp/cx25821-video-upstream-ch2.c
> @@ -707,7 +707,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> int err = 0;
> int data_frame_size = 0;
> int risc_buffer_size = 0;
> - int str_length = 0;
>
> if (dev->_is_running_ch2) {
> pr_info("Video Channel is still running so return!\n");
> @@ -743,24 +742,16 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> risc_buffer_size = dev->_isNTSC_ch2 ?
> NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
>
> - if (dev->input_filename_ch2) {
> - str_length = strlen(dev->input_filename_ch2);
> - dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
> - str_length + 1, GFP_KERNEL);
> -
> - 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->input_filename_ch2)
> + dev->_filename_ch2 = kstrdup(dev->input_filename_ch2,
> + GFP_KERNEL);
> + else
> + dev->_filename_ch2 = kstrdup(dev->_defaultname_ch2,
> + GFP_KERNEL);
>
> - if (!dev->_filename_ch2) {
> - err = -ENOENT;
> - goto error;
> - }
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> + goto error;
> }
>
> /* Default if filename is empty string */
>
> --
> 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
Cheers,
Mauro
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup
@ 2012-09-23 20:29 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 6+ messages in thread
From: Mauro Carvalho Chehab @ 2012-09-23 20:29 UTC (permalink / raw)
To: Peter Senna Tschudin; +Cc: kernel-janitors, linux-media, linux-kernel
Em Mon, 10 Sep 2012 14:45:54 +0200
Peter Senna Tschudin <peter.senna@gmail.com> escreveu:
> From: Peter Senna Tschudin <peter.senna@gmail.com>
>
> Replace kmemdup for kstrdup and cleaning up the code.
>
> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Maintainers/interested parties not copied. Also:
Hunk #1 succeeded at 708 (offset 1 line).
Hunk #2 FAILED at 742.
1 out of 2 hunks FAILED -- saving rejects to file drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c.rej
tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
>
> ---
> It depends on the patch http://patchwork.linuxtv.org/patch/14231/
>
> tmp/cx25821-video-upstream-ch2.c | 27 +++++++++------------------
> 1 file changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c b/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> index 273df94..b663dac 100644
> --- a/drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c
> +++ b/tmp/cx25821-video-upstream-ch2.c
> @@ -707,7 +707,6 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> int err = 0;
> int data_frame_size = 0;
> int risc_buffer_size = 0;
> - int str_length = 0;
>
> if (dev->_is_running_ch2) {
> pr_info("Video Channel is still running so return!\n");
> @@ -743,24 +742,16 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,
> risc_buffer_size = dev->_isNTSC_ch2 ?
> NTSC_RISC_BUF_SIZE : PAL_RISC_BUF_SIZE;
>
> - if (dev->input_filename_ch2) {
> - str_length = strlen(dev->input_filename_ch2);
> - dev->_filename_ch2 = kmemdup(dev->input_filename_ch2,
> - str_length + 1, GFP_KERNEL);
> -
> - 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->input_filename_ch2)
> + dev->_filename_ch2 = kstrdup(dev->input_filename_ch2,
> + GFP_KERNEL);
> + else
> + dev->_filename_ch2 = kstrdup(dev->_defaultname_ch2,
> + GFP_KERNEL);
>
> - if (!dev->_filename_ch2) {
> - err = -ENOENT;
> - goto error;
> - }
> + if (!dev->_filename_ch2) {
> + err = -ENOENT;
> + goto error;
> }
>
> /* Default if filename is empty string */
>
> --
> 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
Cheers,
Mauro
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-23 20:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-10 12:45 [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: Replace kmemdup for kstrdup Peter Senna Tschudin
2012-09-10 12:45 ` Peter Senna Tschudin
2012-09-23 20:29 ` Mauro Carvalho Chehab
2012-09-23 20:29 ` Mauro Carvalho Chehab
-- strict thread matches above, loose matches on Subject: below --
2012-09-07 13:46 [PATCH] drivers/media/pci/cx25821/cx25821-video-upstream-ch2.c: fix error return code Peter Senna Tschudin
2012-09-07 13:46 ` Peter Senna Tschudin
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.