Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751544AbaJQUq7 (ORCPT ); Fri, 17 Oct 2014 16:46:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48471 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750968AbaJQUq5 (ORCPT ); Fri, 17 Oct 2014 16:46:57 -0400 Date: Fri, 17 Oct 2014 13:46:45 -0700 From: tip-bot for Fabian Frederick Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, hpa@linux.intel.com, mingo@kernel.org, tglx@linutronix.de, fabf@skynet.be Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, fabf@skynet.be, mingo@kernel.org, tglx@linutronix.de, hpa@linux.intel.com In-Reply-To: <1413576066-26925-1-git-send-email-fabf@skynet.be> References: <1413576066-26925-1-git-send-email-fabf@skynet.be> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] x86/simplefb: Use PTR_ERR_OR_ZERO Git-Commit-ID: 76ef0db72f8b74bb92e24775d9d7f5ab26352bec 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 Commit-ID: 76ef0db72f8b74bb92e24775d9d7f5ab26352bec Gitweb: http://git.kernel.org/tip/76ef0db72f8b74bb92e24775d9d7f5ab26352bec Author: Fabian Frederick AuthorDate: Fri, 17 Oct 2014 22:01:05 +0200 Committer: H. Peter Anvin CommitDate: Fri, 17 Oct 2014 13:40:52 -0700 x86/simplefb: Use PTR_ERR_OR_ZERO Replace IS_ERR/PTR_ERR Signed-off-by: Fabian Frederick Link: http://lkml.kernel.org/r/1413576066-26925-1-git-send-email-fabf@skynet.be Signed-off-by: H. Peter Anvin --- arch/x86/kernel/sysfb_simplefb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/kernel/sysfb_simplefb.c b/arch/x86/kernel/sysfb_simplefb.c index 86179d4..764a29f 100644 --- a/arch/x86/kernel/sysfb_simplefb.c +++ b/arch/x86/kernel/sysfb_simplefb.c @@ -88,8 +88,5 @@ __init int create_simplefb(const struct screen_info *si, pd = platform_device_register_resndata(NULL, "simple-framebuffer", 0, &res, 1, mode, sizeof(*mode)); - if (IS_ERR(pd)) - return PTR_ERR(pd); - - return 0; + return PTR_ERR_OR_ZERO(pd); } -- 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/