From patchwork Tue Feb 3 00:17:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Klimov X-Patchwork-Id: 5161 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1317WU5031181 for ; Tue, 3 Feb 2009 01:07:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751178AbZBCBHb (ORCPT ); Mon, 2 Feb 2009 20:07:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752703AbZBCBHb (ORCPT ); Mon, 2 Feb 2009 20:07:31 -0500 Received: from fg-out-1718.google.com ([72.14.220.153]:49341 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751178AbZBCBHa (ORCPT ); Mon, 2 Feb 2009 20:07:30 -0500 Received: by fg-out-1718.google.com with SMTP id 16so763350fgg.17 for ; Mon, 02 Feb 2009 17:07:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=wUqtdYjjjNjEBZHP2hBG/KO3QpjjyMArJA37+qoCRDg=; b=VzzP5eLcJy73cnVSyx83DWXMIoYYlTgxzLfp8q514ObnB5OHXatUHzlghfh4Em9WnG 3N1vUVB1xcK+VcgrOQrEjigDDWmNDg4uTbQrQUcv/n5jIGid/tcetx1TfndGxGzbNZ+H 1b4ZmTknVW4UeL/Be0g5r5c05U/+ngQ8L2wnA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=NKbLdE+Wi2Fqs0JOfcUlHSelAHQbnvAbjihYSYI32rMys4r7v1agLQD0KT/DAZ0jcg bucfBWZ7Hm/kXohbg5UKA/+5jygqMMbmc6ezTW9C+LKfEyL2IRjGAK7zu2K7TmisMZSU 5DSmXBdaWtnVVKk8Q0c6s5eE/7Qadsc8DX9kk= Received: by 10.86.99.9 with SMTP id w9mr1151712fgb.31.1233623248722; Mon, 02 Feb 2009 17:07:28 -0800 (PST) Received: from ?192.168.1.42? (gw.zunet.ru [217.67.117.64]) by mx.google.com with ESMTPS id 4sm4094185fgg.55.2009.02.02.17.07.27 (version=SSLv3 cipher=RC4-MD5); Mon, 02 Feb 2009 17:07:28 -0800 (PST) Subject: [patch review 1/8] radio-mr800: codingstyle cleanups From: Alexey Klimov To: Douglas Schilling Landgraf Cc: linux-media@vger.kernel.org Date: Tue, 03 Feb 2009 03:17:12 +0300 Message-Id: <1233620232.17456.7.camel@tux.localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Cleanups of many if-check constructions. Signed-off-by: Alexey Klimov diff -r 1dce9d4e2179 linux/drivers/media/radio/radio-mr800.c --- a/linux/drivers/media/radio/radio-mr800.c Sun Feb 01 11:40:27 2009 -0200 +++ b/linux/drivers/media/radio/radio-mr800.c Mon Feb 02 02:22:56 2009 +0300 @@ -378,13 +378,15 @@ struct v4l2_frequency *f) { struct amradio_device *radio = video_get_drvdata(video_devdata(file)); + int retval; /* safety check */ if (radio->removed) return -EIO; 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, "set frequency failed\n"); return 0; @@ -443,6 +445,7 @@ struct v4l2_control *ctrl) { struct amradio_device *radio = video_get_drvdata(video_devdata(file)); + int retval; /* safety check */ if (radio->removed) @@ -451,13 +454,15 @@ switch (ctrl->id) { case V4L2_CID_AUDIO_MUTE: if (ctrl->value) { - if (amradio_stop(radio) < 0) { + retval = amradio_stop(radio); + if (retval < 0) { amradio_dev_warn(&radio->videodev->dev, "amradio_stop failed\n"); return -1; } } else { - if (amradio_start(radio) < 0) { + retval = amradio_start(radio); + if (retval < 0) { amradio_dev_warn(&radio->videodev->dev, "amradio_start failed\n"); return -1; @@ -508,20 +513,24 @@ static int usb_amradio_open(struct file *file) { struct amradio_device *radio = video_get_drvdata(video_devdata(file)); + int retval; lock_kernel(); radio->users = 1; radio->muted = 1; - if (amradio_start(radio) < 0) { + retval = amradio_start(radio); + if (retval < 0) { amradio_dev_warn(&radio->videodev->dev, "radio did not start up properly\n"); radio->users = 0; unlock_kernel(); return -EIO; } - if (amradio_setfreq(radio, radio->curfreq) < 0) + + retval = amradio_setfreq(radio, radio->curfreq); + if (retval < 0) amradio_dev_warn(&radio->videodev->dev, "set frequency failed\n"); @@ -554,8 +563,10 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message) { 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_info(&intf->dev, "going into suspend..\n"); @@ -567,8 +578,10 @@ static int usb_amradio_resume(struct usb_interface *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_info(&intf->dev, "coming out of suspend..\n"); @@ -619,16 +632,16 @@ .release = usb_amradio_device_release, }; -/* check if the device is present and register with v4l and -usb if it is */ +/* check if the device is present and register with v4l and usb if it is */ static int usb_amradio_probe(struct usb_interface *intf, const struct usb_device_id *id) { struct amradio_device *radio; + int retval; radio = kmalloc(sizeof(struct amradio_device), GFP_KERNEL); - if (!(radio)) + if (!radio) return -ENOMEM; radio->buffer = kmalloc(BUFFER_LENGTH, GFP_KERNEL); @@ -657,7 +670,8 @@ mutex_init(&radio->lock); 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"); video_device_release(radio->videodev); kfree(radio->buffer);