Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753080AbbBSLcK (ORCPT ); Thu, 19 Feb 2015 06:32:10 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52994 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbbBSLcH (ORCPT ); Thu, 19 Feb 2015 06:32:07 -0500 Date: Thu, 19 Feb 2015 03:31:49 -0800 From: tip-bot for Fengguang Wu Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, dvhart@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, andy.schevchenko@gmail.com, fengguang.wu@intel.com, pure.logic@nexus-software.ie, boon.leong.ong@intel.com Reply-To: pure.logic@nexus-software.ie, boon.leong.ong@intel.com, fengguang.wu@intel.com, hpa@zytor.com, andy.schevchenko@gmail.com, dvhart@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20150219081432.GA21996@waimea> References: <20150219081432.GA21996@waimea> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/intel/quark: Fix simple_return.cocci warnings Git-Commit-ID: c11a25f443e9bee06fe302b6a78ff44dac554036 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1834 Lines: 50 Commit-ID: c11a25f443e9bee06fe302b6a78ff44dac554036 Gitweb: http://git.kernel.org/tip/c11a25f443e9bee06fe302b6a78ff44dac554036 Author: Fengguang Wu AuthorDate: Thu, 19 Feb 2015 16:14:32 +0800 Committer: Ingo Molnar CommitDate: Thu, 19 Feb 2015 10:00:55 +0100 x86/intel/quark: Fix simple_return.cocci warnings arch/x86/platform/intel-quark/imr.c:129:1-4: WARNING: end returns can be simpified Simplify a trivial if-return sequence. Possibly combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci Signed-off-by: Fengguang Wu Cc: Andy Shevchenko Cc: Ong, Boon Leong Cc: Bryan O'Donoghue Cc: Darren Hart Cc: kbuild-all@01.org Link: http://lkml.kernel.org/r/20150219081432.GA21996@waimea Signed-off-by: Ingo Molnar --- arch/x86/platform/intel-quark/imr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c index 60c01eb..0ee619f 100644 --- a/arch/x86/platform/intel-quark/imr.c +++ b/arch/x86/platform/intel-quark/imr.c @@ -126,12 +126,8 @@ static int imr_read(struct imr_device *idev, u32 imr_id, struct imr_regs *imr) if (ret) return ret; - ret = iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ, + return iosf_mbi_read(QRK_MBI_UNIT_MM, QRK_MBI_MM_READ, reg++, &imr->wmask); - if (ret) - return ret; - - return 0; } /** -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/