Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752808AbbBSLb7 (ORCPT ); Thu, 19 Feb 2015 06:31:59 -0500 Received: from terminus.zytor.com ([198.137.202.10]:52986 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbbBSLb5 (ORCPT ); Thu, 19 Feb 2015 06:31:57 -0500 Date: Thu, 19 Feb 2015 03:31:29 -0800 From: tip-bot for Fengguang Wu Message-ID: Cc: boon.leong.ong@intel.com, mingo@kernel.org, dvhart@linux.intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, andy.schevchenko@gmail.com, fengguang.wu@intel.com, tglx@linutronix.de, pure.logic@nexus-software.ie Reply-To: andy.schevchenko@gmail.com, hpa@zytor.com, tglx@linutronix.de, fengguang.wu@intel.com, pure.logic@nexus-software.ie, boon.leong.ong@intel.com, mingo@kernel.org, dvhart@linux.intel.com, linux-kernel@vger.kernel.org In-Reply-To: <20150219081432.GA21983@waimea> References: <20150219081432.GA21983@waimea> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/intel/quark: Fix ptr_ret.cocci warnings Git-Commit-ID: 32d39169d7f56849b8c6c8c51aca7b73194d05f1 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: 1774 Lines: 48 Commit-ID: 32d39169d7f56849b8c6c8c51aca7b73194d05f1 Gitweb: http://git.kernel.org/tip/32d39169d7f56849b8c6c8c51aca7b73194d05f1 Author: Fengguang Wu AuthorDate: Thu, 19 Feb 2015 16:14:32 +0800 Committer: Ingo Molnar CommitDate: Thu, 19 Feb 2015 10:00:54 +0100 x86/intel/quark: Fix ptr_ret.cocci warnings arch/x86/platform/intel-quark/imr.c:280:1-3: WARNING: PTR_ERR_OR_ZERO can be used Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Generated by: scripts/coccinelle/api/ptr_ret.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.GA21983@waimea Signed-off-by: Ingo Molnar --- arch/x86/platform/intel-quark/imr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/platform/intel-quark/imr.c b/arch/x86/platform/intel-quark/imr.c index 16e4df1..60c01eb 100644 --- a/arch/x86/platform/intel-quark/imr.c +++ b/arch/x86/platform/intel-quark/imr.c @@ -277,10 +277,7 @@ static int imr_debugfs_register(struct imr_device *idev) { idev->file = debugfs_create_file("imr_state", S_IFREG | S_IRUGO, NULL, idev, &imr_state_ops); - if (IS_ERR(idev->file)) - return PTR_ERR(idev->file); - - return 0; + return PTR_ERR_OR_ZERO(idev->file); } /** -- 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/