From patchwork Tue Dec 10 16:05:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lisa Nguyen X-Patchwork-Id: 3394191 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 628519F372 for ; Sun, 22 Dec 2013 13:31:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81370205EF for ; Sun, 22 Dec 2013 13:31:29 +0000 (UTC) Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 88432205E9 for ; Sun, 22 Dec 2013 13:31:27 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id rBMDUJsD025851; Sun, 22 Dec 2013 07:30:20 -0600 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBMDUI9i022759; Sun, 22 Dec 2013 07:30:18 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Sun, 22 Dec 2013 07:30:17 -0600 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBMDUGfg013733; Sun, 22 Dec 2013 07:30:16 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 4CD6680630; Sun, 22 Dec 2013 07:30:14 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlelxv84.itg.ti.com (dlelxv84.itg.ti.com [172.17.0.246]) by linux.omap.com (Postfix) with ESMTP id 54F0680626 for ; Tue, 10 Dec 2013 10:05:56 -0600 (CST) Received: from medina.ext.ti.com (medina.ext.ti.com [192.91.81.31]) by dlelxv84.itg.ti.com (8.14.3/8.13.8) with ESMTP id rBAG5uPq006525 for ; Tue, 10 Dec 2013 10:05:56 -0600 Received: from mail6.bemta8.messagelabs.com (mail6.bemta8.messagelabs.com [216.82.243.55]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id rBAG5tJg020649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 10 Dec 2013 10:05:55 -0600 Received: from [216.82.242.131:60313] by server-4.bemta-8.messagelabs.com id A9/2C-21664-3EB37A25; Tue, 10 Dec 2013 16:05:55 +0000 X-Env-Sender: lisa@xenapiadmin.com X-Msg-Ref: server-12.tower-76.messagelabs.com!1386691545!25984602!1 X-Originating-IP: [209.85.192.179] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30192 invoked from network); 10 Dec 2013 16:05:46 -0000 Received: from mail-pd0-f179.google.com (HELO mail-pd0-f179.google.com) (209.85.192.179) by server-12.tower-76.messagelabs.com with RC4-SHA encrypted SMTP; 10 Dec 2013 16:05:46 -0000 Received: by mail-pd0-f179.google.com with SMTP id r10so7655883pdi.10 for ; Tue, 10 Dec 2013 08:05:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=1IhCxyet8WZYmrlq83mxvhMquaBHiKMFUV9/DrAYhNg=; b=CkIv3wKSZ09JI8i/57dAftyRGkb5a8ZVxn79///tgeydg/FDtST85X1eHg47aIeCqC gkJAHOa8+O5+96dY7XI3m38n22faClfA4GHuXCbU58IvTDDmAoFkctpyv3Qnso2ioK16 lCDSYC2Vb7jGgHxR/tDzfQb2rJKiNsi7GhD9pHy4QduHscGEz1vZhk9XgcSclSdjjh4s bHHa6CZ+qhCRPtgjVmjrxmg6iSUucf+GmzPWUQCOv7wZ1op5sZlG6K5q4UiWt1r3S5aN ANVeBtdZ/CElYB12Lp65t10+OG5dzIHctn4aBvykM8e8tKmt+VlzGCsYYVM9+9IG46QN Geug== X-Gm-Message-State: ALoCoQnbxf549qofH+3KoDfvqrujgGCvilS8XLEacdRi2RuYcJLPGAV6H7KaGXPxDYIv4zfJnKY9 X-Received: by 10.68.219.167 with SMTP id pp7mr28437228pbc.125.1386691544124; Tue, 10 Dec 2013 08:05:44 -0800 (PST) Received: from ubuntu (50-47-9-157.evrt.wa.frontiernet.net. [50.47.9.157]) by mx.google.com with ESMTPSA id yg3sm36473819pab.16.2013.12.10.08.05.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 08:05:42 -0800 (PST) Date: Tue, 10 Dec 2013 08:05:42 -0800 From: Lisa Nguyen To: Subject: [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c Message-ID: <20131210160541.GA15282@ubuntu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Sun, 22 Dec 2013 07:30:06 -0600 CC: , , , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rewrite the return statement in vpfe_video.c to eliminate the use of a ternary operator. This will prevent the checkpatch.pl script from generating a warning saying to remove () from this particular return statement. Signed-off-by: Lisa Nguyen --- Changes since v2: - Aligned -ETIMEDOUT return statement with if condition drivers/staging/media/davinci_vpfe/vpfe_video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 24d98a6..22e31d2 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -346,7 +346,10 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe) } mutex_unlock(&mdev->graph_mutex); - return (ret == 0) ? ret : -ETIMEDOUT ; + if (ret == 0) + return ret; + + return -ETIMEDOUT; } /*