Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

V4L/DVB (10455): radio-mr800: codingstyle cleanups

Browse source 
Cleanups of many if-check constructions.

Signed-off-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>
This commit is contained in:
Alexey Klimov 2009-02-05 08:48:43 -03:00 committed by Mauro Carvalho Chehab
parent d563399859
commit a5d6947515
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
drivers/media/radio/radio-mr800.c
View file

@ -375,13 +375,15 @@ static int vidioc_s_frequency(struct file *file, void *priv,
struct v4l2_frequency *f) struct v4l2_frequency *f)
{ {
struct amradio_device *radio = video_get_drvdata(video_devdata(file)); struct amradio_device *radio = video_get_drvdata(video_devdata(file));
int retval;
/* safety check */ /* safety check */
if (radio->removed) if (radio->removed)
return -EIO; return -EIO;
radio->curfreq = f->frequency; radio->curfreq = f->frequency;
if (amradio_setfreq(radio, radio->curfreq) < 0) retval = amradio_setfreq(radio, radio->curfreq);
if (retval < 0)
amradio_dev_warn(&radio->videodev->dev, amradio_dev_warn(&radio->videodev->dev,
"set frequency failed\n"); "set frequency failed\n");
return 0; return 0;
@ -440,6 +442,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
struct v4l2_control *ctrl) struct v4l2_control *ctrl)
{ {
struct amradio_device *radio = video_get_drvdata(video_devdata(file)); struct amradio_device *radio = video_get_drvdata(video_devdata(file));
int retval;
/* safety check */ /* safety check */
if (radio->removed) if (radio->removed)
@ -448,13 +451,15 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
switch (ctrl->id) { switch (ctrl->id) {
case V4L2_CID_AUDIO_MUTE: case V4L2_CID_AUDIO_MUTE:
if (ctrl->value) { if (ctrl->value) {
if (amradio_stop(radio) < 0) { retval = amradio_stop(radio);
if (retval < 0) {
amradio_dev_warn(&radio->videodev->dev, amradio_dev_warn(&radio->videodev->dev,
"amradio_stop failed\n"); "amradio_stop failed\n");
return -1; return -1;
} }
} else { } else {
if (amradio_start(radio) < 0) { retval = amradio_start(radio);
if (retval < 0) {
amradio_dev_warn(&radio->videodev->dev, amradio_dev_warn(&radio->videodev->dev,
"amradio_start failed\n"); "amradio_start failed\n");
return -1; return -1;
@ -505,20 +510,24 @@ static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
static int usb_amradio_open(struct file *file) static int usb_amradio_open(struct file *file)
{ {
struct amradio_device *radio = video_get_drvdata(video_devdata(file)); struct amradio_device *radio = video_get_drvdata(video_devdata(file));
int retval;
lock_kernel(); lock_kernel();
radio->users = 1; radio->users = 1;
radio->muted = 1; radio->muted = 1;
if (amradio_start(radio) < 0) { retval = amradio_start(radio);
if (retval < 0) {
amradio_dev_warn(&radio->videodev->dev, amradio_dev_warn(&radio->videodev->dev,
"radio did not start up properly\n"); "radio did not start up properly\n");
radio->users = 0; radio->users = 0;
unlock_kernel(); unlock_kernel();
return -EIO; return -EIO;
} }
if (amradio_setfreq(radio, radio->curfreq) < 0)
retval = amradio_setfreq(radio, radio->curfreq);
if (retval < 0)
amradio_dev_warn(&radio->videodev->dev, amradio_dev_warn(&radio->videodev->dev,
"set frequency failed\n"); "set frequency failed\n");
@ -551,8 +560,10 @@ static int usb_amradio_close(struct file *file)
static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message) static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
{ {
struct amradio_device *radio = usb_get_intfdata(intf); struct amradio_device *radio = usb_get_intfdata(intf);
int retval;
if (amradio_stop(radio) < 0) retval = amradio_stop(radio);
if (retval < 0)
dev_warn(&intf->dev, "amradio_stop failed\n"); dev_warn(&intf->dev, "amradio_stop failed\n");
dev_info(&intf->dev, "going into suspend..\n"); dev_info(&intf->dev, "going into suspend..\n");
@ -564,8 +575,10 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
static int usb_amradio_resume(struct usb_interface *intf) static int usb_amradio_resume(struct usb_interface *intf)
{ {
struct amradio_device *radio = usb_get_intfdata(intf); struct amradio_device *radio = usb_get_intfdata(intf);
int retval;
if (amradio_start(radio) < 0) retval = amradio_start(radio);
if (retval < 0)
dev_warn(&intf->dev, "amradio_start failed\n"); dev_warn(&intf->dev, "amradio_start failed\n");
dev_info(&intf->dev, "coming out of suspend..\n"); dev_info(&intf->dev, "coming out of suspend..\n");
@ -616,16 +629,16 @@ static struct video_device amradio_videodev_template = {
.release = usb_amradio_device_release, .release = usb_amradio_device_release,
}; };
/* check if the device is present and register with v4l and /* check if the device is present and register with v4l and usb if it is */
usb if it is */
static int usb_amradio_probe(struct usb_interface *intf, static int usb_amradio_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct amradio_device *radio; struct amradio_device *radio;
int retval;
radio = kmalloc(sizeof(struct amradio_device), GFP_KERNEL); radio = kmalloc(sizeof(struct amradio_device), GFP_KERNEL);
if (!(radio)) if (!radio)
return -ENOMEM; return -ENOMEM;
radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL); radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL);
@ -654,7 +667,8 @@ static int usb_amradio_probe(struct usb_interface *intf,
mutex_init(&radio->lock); mutex_init(&radio->lock);
video_set_drvdata(radio->videodev, radio); video_set_drvdata(radio->videodev, radio);
if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) { retval = video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr);
if (retval < 0) {
dev_warn(&intf->dev, "could not register video device\n"); dev_warn(&intf->dev, "could not register video device\n");
video_device_release(radio->videodev); video_device_release(radio->videodev);
kfree(radio->buffer); kfree(radio->buffer);