Skip to content

Commit

Permalink
V4L/DVB (13072): radio-mr800: simplify device warnings
Browse files Browse the repository at this point in the history 
Simplify device warnings.

Signed-off-by: David Ellingsworth <david@identd.dyndns.org>
Acked-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
David Ellingsworth authored and Mauro Carvalho Chehab committed Dec 5, 2009
1 parent d8970e5 commit 16a72f4
Showing 1 changed file with 26 additions and 52 deletions.
78 changes: 26 additions & 52 deletions drivers/media/radio/radio-mr800.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ static int amradio_set_mute(struct amradio_device *radio, char argument)
retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
(void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);

if (retval < 0 || size != BUFFER_LENGTH)
if (retval < 0 || size != BUFFER_LENGTH) {
amradio_dev_warn(&radio->videodev.dev, "set mute failed\n");
return retval;
}

radio->muted = argument;

Expand Down Expand Up @@ -216,7 +218,7 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
(void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);

if (retval < 0 || size != BUFFER_LENGTH)
return retval;
goto out_err;

/* frequency is calculated from freq_send and placed in first 2 bytes */
radio->buffer[0] = (freq_send >> 8) & 0xff;
Expand All @@ -230,6 +232,14 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
(void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);

if (retval < 0 || size != BUFFER_LENGTH)
goto out_err;

goto out;

out_err:
amradio_dev_warn(&radio->videodev.dev, "set frequency failed\n");
out:
return retval;
}

Expand All @@ -252,8 +262,10 @@ static int amradio_set_stereo(struct amradio_device *radio, char argument)
retval = usb_bulk_msg(radio->usbdev, usb_sndintpipe(radio->usbdev, 2),
(void *) (radio->buffer), BUFFER_LENGTH, &size, USB_TIMEOUT);

if (retval < 0 || size != BUFFER_LENGTH)
if (retval < 0 || size != BUFFER_LENGTH) {
amradio_dev_warn(&radio->videodev.dev, "set stereo failed\n");
return retval;
}

if (argument == WANT_STEREO)
radio->stereo = 1;
Expand Down Expand Up @@ -314,9 +326,6 @@ static int vidioc_g_tuner(struct file *file, void *priv,
* amradio_set_stereo shouldn't be here
*/
retval = amradio_set_stereo(radio, WANT_STEREO);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"set stereo failed\n");

strcpy(v->name, "FM");
v->type = V4L2_TUNER_RADIO;
Expand Down Expand Up @@ -348,15 +357,9 @@ static int vidioc_s_tuner(struct file *file, void *priv,
switch (v->audmode) {
case V4L2_TUNER_MODE_MONO:
retval = amradio_set_stereo(radio, WANT_MONO);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"set mono failed\n");
break;
case V4L2_TUNER_MODE_STEREO:
retval = amradio_set_stereo(radio, WANT_STEREO);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"set stereo failed\n");
break;
}

Expand All @@ -373,9 +376,6 @@ static int vidioc_s_frequency(struct file *file, void *priv,
radio->curfreq = f->frequency;

retval = amradio_setfreq(radio, radio->curfreq);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"set frequency failed\n");

return retval;
}
Expand Down Expand Up @@ -428,19 +428,11 @@ static int vidioc_s_ctrl(struct file *file, void *priv,

switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE:
if (ctrl->value) {
if (ctrl->value)
retval = amradio_set_mute(radio, AMRADIO_STOP);
if (retval < 0) {
amradio_dev_warn(&radio->videodev.dev,
"amradio_stop failed\n");
}
} else {
else
retval = amradio_set_mute(radio, AMRADIO_START);
if (retval < 0) {
amradio_dev_warn(&radio->videodev.dev,
"amradio_start failed\n");
}
}

break;
}

Expand Down Expand Up @@ -488,16 +480,12 @@ static int usb_amradio_init(struct amradio_device *radio)
int retval;

retval = amradio_set_mute(radio, AMRADIO_STOP);
if (retval < 0) {
amradio_dev_warn(&radio->videodev.dev, "amradio_stop failed\n");
if (retval)
goto out_err;
}

retval = amradio_set_stereo(radio, WANT_STEREO);
if (retval < 0) {
amradio_dev_warn(&radio->videodev.dev, "set stereo failed\n");
if (retval)
goto out_err;
}

radio->initialized = 1;
goto out;
Expand Down Expand Up @@ -570,14 +558,11 @@ static long usb_amradio_ioctl(struct file *file, unsigned int cmd,
static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
{
struct amradio_device *radio = usb_get_intfdata(intf);
int retval;

mutex_lock(&radio->lock);

if (!radio->muted && radio->initialized) {
retval = amradio_set_mute(radio, AMRADIO_STOP);
if (retval < 0)
dev_warn(&intf->dev, "amradio_stop failed\n");
amradio_set_mute(radio, AMRADIO_STOP);
radio->muted = 0;
}

Expand All @@ -591,32 +576,21 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_amradio_resume(struct usb_interface *intf)
{
struct amradio_device *radio = usb_get_intfdata(intf);
int retval;

mutex_lock(&radio->lock);

if (unlikely(!radio->initialized))
goto unlock;

if (radio->stereo)
retval = amradio_set_stereo(radio, WANT_STEREO);
amradio_set_stereo(radio, WANT_STEREO);
else
retval = amradio_set_stereo(radio, WANT_MONO);
amradio_set_stereo(radio, WANT_MONO);

if (retval < 0)
amradio_dev_warn(&radio->videodev.dev, "set stereo failed\n");
amradio_setfreq(radio, radio->curfreq);

retval = amradio_setfreq(radio, radio->curfreq);
if (retval < 0)
amradio_dev_warn(&radio->videodev.dev,
"set frequency failed\n");

if (!radio->muted) {
retval = amradio_set_mute(radio, AMRADIO_START);
if (retval < 0)
dev_warn(&radio->videodev.dev,
"amradio_start failed\n");
}
if (!radio->muted)
amradio_set_mute(radio, AMRADIO_START);

unlock:
dev_info(&intf->dev, "coming out of suspend..\n");
Expand Down

0 comments on commit 16a72f4

Please sign in to comment.