From patchwork Thu May 27 16:39:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ellingsworth X-Patchwork-Id: 3522 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Thu, 27 May 2010 16:40:56 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 27 May 2010 13:45:38 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1OHg8e-0007yF-HK; Thu, 27 May 2010 16:40:56 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757622Ab0E0Qky (ORCPT + 1 other); Thu, 27 May 2010 12:40:54 -0400 Received: from 99-34-136-231.lightspeed.bcvloh.sbcglobal.net ([99.34.136.231]:41828 "EHLO desource.dyndns.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757525Ab0E0Qkv (ORCPT ); Thu, 27 May 2010 12:40:51 -0400 Received: from root by desource.dyndns.org with local (Exim 4.71) (envelope-from ) id 1OHg7X-0006kJ-7h; Thu, 27 May 2010 12:39:47 -0400 From: David Ellingsworth To: linux-media@vger.kernel.org Cc: Markus Demleitner , Mauro Carvalho Chehab , David Ellingsworth Subject: [PATCH/RFC v2 5/8] dsbr100: cleanup return value of start/stop handlers Date: Thu, 27 May 2010 12:39:13 -0400 Message-Id: <1274978356-25836-6-git-send-email-david@identd.dyndns.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <[PATCH/RFC 0/7] dsbr100: driver cleanup> References: <[PATCH/RFC 0/7] dsbr100: driver cleanup> X-SA-Exim-Connect-IP: X-SA-Exim-Rcpt-To: linux-media@vger.kernel.org, msdemlei@tucana.harvard.edu, mchehab@infradead.org, david@identd.dyndns.org X-SA-Exim-Mail-From: root@desource.dyndns.org X-SA-Exim-Scanned: No (on desource.dyndns.org); SAEximRunCond expanded to false Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The value returned from the device in radio->transfer_buffer[0] isn't clearly defined, but is used as a return code. This value is an unsigned 8-bit integer that is implicitly converted to an int. Since this value can never be less than 0, return 0 instead. This simplifies the verification of calling dsbr100_start and dsbr100_stop. Signed-off-by: David Ellingsworth --- drivers/media/radio/dsbr100.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index c949ace..0e009b7 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c @@ -206,7 +206,7 @@ static int dsbr100_start(struct dsbr100_device *radio) } radio->status = STARTED; - return (radio->transfer_buffer)[0]; + return 0; usb_control_msg_failed: dev_err(&radio->usbdev->dev, @@ -247,7 +247,7 @@ static int dsbr100_stop(struct dsbr100_device *radio) } radio->status = STOPPED; - return (radio->transfer_buffer)[0]; + return 0; usb_control_msg_failed: dev_err(&radio->usbdev->dev, @@ -461,14 +461,14 @@ static int vidioc_s_ctrl(struct file *file, void *priv, case V4L2_CID_AUDIO_MUTE: if (ctrl->value) { retval = dsbr100_stop(radio); - if (retval < 0) { + if (retval) { dev_warn(&radio->usbdev->dev, "Radio did not respond properly\n"); return -EBUSY; } } else { retval = dsbr100_start(radio); - if (retval < 0) { + if (retval) { dev_warn(&radio->usbdev->dev, "Radio did not respond properly\n"); return -EBUSY; @@ -542,7 +542,7 @@ static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message) if (radio->status == STARTED) { retval = dsbr100_stop(radio); - if (retval < 0) + if (retval) dev_warn(&intf->dev, "dsbr100_stop failed\n"); /* After dsbr100_stop() status set to STOPPED. @@ -569,7 +569,7 @@ static int usb_dsbr100_resume(struct usb_interface *intf) if (radio->status == STARTED) { retval = dsbr100_start(radio); - if (retval < 0) + if (retval) dev_warn(&intf->dev, "dsbr100_start failed\n"); }