mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-13 22:25:03 +00:00
Code Issues Releases Wiki Activity

[media] radio-si470x-common.c: remove unnecessary kernel log spam

Browse source 
There is no need to report an error in the log, you are already returning
that error to userspace after all.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2012-04-30 19:49:27 -03:00 committed by Mauro Carvalho Chehab
parent eae63ae007
commit 340bd4c16c
1 changed files with 17 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
drivers/media/radio/si470x/radio-si470x-common.c
View file

@ -327,7 +327,7 @@ static int si470x_set_seek(struct si470x_device *radio,
radio->registers[POWERCFG] &= ~POWERCFG_SEEKUP;
retval = si470x_set_register(radio, POWERCFG);
if (retval < 0)
goto done;
return retval;
/* currently I2C driver only uses interrupt way to seek */
if (radio->stci_enabled) {
@ -355,20 +355,15 @@ static int si470x_set_seek(struct si470x_device *radio,
if (radio->registers[STATUSRSSI] & STATUSRSSI_SF)
dev_warn(&radio->videodev.dev,
"seek failed / band limit reached\n");
if (timed_out)
dev_warn(&radio->videodev.dev,
"seek timed out after %u ms\n", seek_timeout);
stop:
/* stop seeking */
radio->registers[POWERCFG] &= ~POWERCFG_SEEK;
retval = si470x_set_register(radio, POWERCFG);
done:
/* try again, if timed out */
if ((retval == 0) && timed_out)
retval = -EAGAIN;
if (retval == 0 && timed_out)
return -EAGAIN;
return retval;
}
@ -589,16 +584,14 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
struct v4l2_tuner *tuner)
{
struct si470x_device *radio = video_drvdata(file);
int retval = 0;
int retval;
if (tuner->index != 0) {
retval = -EINVAL;
goto done;
}
if (tuner->index != 0)
return -EINVAL;
retval = si470x_get_register(radio, STATUSRSSI);
if (retval < 0)
goto done;
return retval;
/* driver constants */
strcpy(tuner->name, "FM");
@ -653,10 +646,6 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
/* AFCRL does only indicate that freq. differs, not if too low/high */
tuner->afc = (radio->registers[STATUSRSSI] & STATUSRSSI_AFCRL) ? 1 : 0;
done:
if (retval < 0)
dev_warn(&radio->videodev.dev,
"get tuner failed with %d\n", retval);
return retval;
}
@ -668,7 +657,6 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
struct v4l2_tuner *tuner)
{
struct si470x_device *radio = video_drvdata(file);
int retval = 0;
if (tuner->index != 0)
return -EINVAL;
@ -684,12 +672,7 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
break;
}
retval = si470x_set_register(radio, POWERCFG);
if (retval < 0)
dev_warn(&radio->videodev.dev,
"set tuner failed with %d\n", retval);
return retval;
return si470x_set_register(radio, POWERCFG);
}
@ -700,21 +683,12 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
struct v4l2_frequency *freq)
{
struct si470x_device *radio = video_drvdata(file);
int retval = 0;
if (freq->tuner != 0) {
retval = -EINVAL;
goto done;
}
if (freq->tuner != 0)
return -EINVAL;
freq->type = V4L2_TUNER_RADIO;
retval = si470x_get_freq(radio, &freq->frequency);
done:
if (retval < 0)
dev_warn(&radio->videodev.dev,
"get frequency failed with %d\n", retval);
return retval;
return si470x_get_freq(radio, &freq->frequency);
}
@ -725,20 +699,11 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
struct v4l2_frequency *freq)
{
struct si470x_device *radio = video_drvdata(file);
int retval = 0;
if (freq->tuner != 0) {
retval = -EINVAL;
goto done;
}
if (freq->tuner != 0)
return -EINVAL;
retval = si470x_set_freq(radio, freq->frequency);
done:
if (retval < 0)
dev_warn(&radio->videodev.dev,
"set frequency failed with %d\n", retval);
return retval;
return si470x_set_freq(radio, freq->frequency);
}
@ -749,20 +714,11 @@ static int si470x_vidioc_s_hw_freq_seek(struct file *file, void *priv,
struct v4l2_hw_freq_seek *seek)
{
struct si470x_device *radio = video_drvdata(file);
int retval = 0;
if (seek->tuner != 0) {
retval = -EINVAL;
goto done;
}
if (seek->tuner != 0)
return -EINVAL;
retval = si470x_set_seek(radio, seek->wrap_around, seek->seek_upward);
done:
if (retval < 0)
dev_warn(&radio->videodev.dev,
"set hardware frequency seek failed with %d\n", retval);
return retval;
return si470x_set_seek(radio, seek->wrap_around, seek->seek_upward);
}
const struct v4l2_ctrl_ops si470x_ctrl_ops = {