* [PATCH 1/3] cx25821: fix error return code and clean up
@ 2012-09-17 8:04 Peter Senna Tschudin
2012-09-17 8:04 ` [PATCH 2/3] cx25821: Replace kmemdup for kstrdup " Peter Senna Tschudin
2012-09-17 8:04 ` [PATCH 3/3] cx25821: Cleanup filename assignment code Peter Senna Tschudin
0 siblings, 2 replies; 3+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 8:04 UTC (permalink / raw)
To: mchehab
Cc: leonidsbox, peter.senna, thomas, hans.verkuil, linux-media, linux-kernel
From: Peter Senna Tschudin <peter.senna@gmail.com>
The function cx25821_sram_channel_setup_upstream_audio always return zero,
so the return value is not saved any more.
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-audio-upstream.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
index 8b2a999..49a28ae 100644
--- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
@@ -700,7 +700,6 @@ fail_irq:
int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
{
struct sram_channel *sram_ch;
- int retval = 0;
int err = 0;
int str_length = 0;
@@ -735,8 +734,10 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
dev->_audiofilename = kmemdup(dev->input_audiofilename,
str_length + 1, GFP_KERNEL);
- if (!dev->_audiofilename)
+ if (!dev->_audiofilename) {
+ err = -ENOMEM;
goto error;
+ }
/* Default if filename is empty string */
if (strcmp(dev->input_audiofilename, "") == 0)
@@ -746,12 +747,14 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
dev->_audiofilename = kmemdup(_defaultAudioName,
str_length + 1, GFP_KERNEL);
- if (!dev->_audiofilename)
+ if (!dev->_audiofilename) {
+ err = -ENOMEM;
goto error;
+ }
}
- retval = cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,
- _line_size, 0);
+ cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,
+ _line_size, 0);
dev->audio_upstream_riscbuf_size =
AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +
@@ -759,9 +762,9 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS;
/* Allocating buffers and prepare RISC program */
- retval = cx25821_audio_upstream_buffer_prepare(dev, sram_ch,
+ err = cx25821_audio_upstream_buffer_prepare(dev, sram_ch,
_line_size);
- if (retval < 0) {
+ if (err < 0) {
pr_err("%s: Failed to set up Audio upstream buffers!\n",
dev->name);
goto error;
--
1.7.11.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/3] cx25821: Replace kmemdup for kstrdup and clean up
2012-09-17 8:04 [PATCH 1/3] cx25821: fix error return code and clean up Peter Senna Tschudin
@ 2012-09-17 8:04 ` Peter Senna Tschudin
2012-09-17 8:04 ` [PATCH 3/3] cx25821: Cleanup filename assignment code Peter Senna Tschudin
1 sibling, 0 replies; 3+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 8:04 UTC (permalink / raw)
To: mchehab
Cc: leonidsbox, peter.senna, thomas, hans.verkuil, linux-media, linux-kernel
Replace kmemdup for kstrdup and cleanup related code.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/pci/cx25821/cx25821-audio-upstream.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
index 49a28ae..1cc797e 100644
--- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
@@ -701,7 +701,6 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
{
struct sram_channel *sram_ch;
int err = 0;
- int str_length = 0;
if (dev->_audio_is_running) {
pr_warn("Audio Channel is still running so return!\n");
@@ -730,9 +729,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
_line_size = AUDIO_LINE_SIZE;
if (dev->input_audiofilename) {
- str_length = strlen(dev->input_audiofilename);
- dev->_audiofilename = kmemdup(dev->input_audiofilename,
- str_length + 1, GFP_KERNEL);
+ dev->_audiofilename = kstrdup(dev->input_audiofilename,
+ GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
@@ -743,9 +741,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
if (strcmp(dev->input_audiofilename, "") == 0)
dev->_audiofilename = "/root/audioGOOD.wav";
} else {
- str_length = strlen(_defaultAudioName);
- dev->_audiofilename = kmemdup(_defaultAudioName,
- str_length + 1, GFP_KERNEL);
+ dev->_audiofilename = kstrdup(_defaultAudioName,
+ GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
--
1.7.11.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 3/3] cx25821: Cleanup filename assignment code
2012-09-17 8:04 [PATCH 1/3] cx25821: fix error return code and clean up Peter Senna Tschudin
2012-09-17 8:04 ` [PATCH 2/3] cx25821: Replace kmemdup for kstrdup " Peter Senna Tschudin
@ 2012-09-17 8:04 ` Peter Senna Tschudin
1 sibling, 0 replies; 3+ messages in thread
From: Peter Senna Tschudin @ 2012-09-17 8:04 UTC (permalink / raw)
To: mchehab
Cc: leonidsbox, peter.senna, thomas, hans.verkuil, linux-media, linux-kernel
I'm pasting the original code and my proposal on the commit message for
make it easy to compare the two versions.
Line 62 of cx25821-audio-upstream.h contains:
char *_defaultAudioName = "/root/audioGOOD.wav";
Original code after replace kmemdup for kstrdup, and after fix return error
code:
if (dev->input_audiofilename) {
dev->_audiofilename = kstrdup(dev->input_audiofilename,
GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
goto error;
}
/* Default if filename is empty string */
if (strcmp(dev->input_audiofilename, "") == 0)
dev->_audiofilename = "/root/audioGOOD.wav";
} else {
dev->_audiofilename = kstrdup(_defaultAudioName,
GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
goto error;
}
}
Code proposed in this patch:
if ((dev->input_audiofilename) &&
(strcmp(dev->input_audiofilename, "") != 0))
dev->_audiofilename = kstrdup(dev->input_audiofilename,
GFP_KERNEL);
else
dev->_audiofilename = kstrdup(_defaultAudioName,
GFP_KERNEL);
if (!dev->_audiofilename) {
err = -ENOMEM;
goto error;
}
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
---
drivers/media/pci/cx25821/cx25821-audio-upstream.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/drivers/media/pci/cx25821/cx25821-audio-upstream.c b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
index 1cc797e..83316a8 100644
--- a/drivers/media/pci/cx25821/cx25821-audio-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-audio-upstream.c
@@ -728,26 +728,17 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
dev->_audio_lines_count = LINES_PER_AUDIO_BUFFER;
_line_size = AUDIO_LINE_SIZE;
- if (dev->input_audiofilename) {
+ if ((dev->input_audiofilename) &&
+ (strcmp(dev->input_audiofilename, "") != 0))
dev->_audiofilename = kstrdup(dev->input_audiofilename,
GFP_KERNEL);
-
- if (!dev->_audiofilename) {
- err = -ENOMEM;
- goto error;
- }
-
- /* Default if filename is empty string */
- if (strcmp(dev->input_audiofilename, "") == 0)
- dev->_audiofilename = "/root/audioGOOD.wav";
- } else {
+ else
dev->_audiofilename = kstrdup(_defaultAudioName,
GFP_KERNEL);
- if (!dev->_audiofilename) {
- err = -ENOMEM;
- goto error;
- }
+ if (!dev->_audiofilename) {
+ err = -ENOMEM;
+ goto error;
}
cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,
--
1.7.11.4
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-17 8:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-17 8:04 [PATCH 1/3] cx25821: fix error return code and clean up Peter Senna Tschudin
2012-09-17 8:04 ` [PATCH 2/3] cx25821: Replace kmemdup for kstrdup " Peter Senna Tschudin
2012-09-17 8:04 ` [PATCH 3/3] cx25821: Cleanup filename assignment code 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
Powered by JetHome