Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751448AbaJQUqd (ORCPT ); Fri, 17 Oct 2014 16:46:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48459 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbaJQUqc (ORCPT ); Fri, 17 Oct 2014 16:46:32 -0400 Date: Fri, 17 Oct 2014 13:46:16 -0700 From: tip-bot for Fabian Frederick Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, hpa@linux.intel.com, fabf@skynet.be, linux-kernel@vger.kernel.org Reply-To: hpa@linux.intel.com, fabf@skynet.be, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1413576077-26969-1-git-send-email-fabf@skynet.be> References: <1413576077-26969-1-git-send-email-fabf@skynet.be> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] x86, cpuid: Use PTR_ERR_OR_ZERO Git-Commit-ID: cbda45a2d4798912637b5b792c1c7a97c8d8b080 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: cbda45a2d4798912637b5b792c1c7a97c8d8b080 Gitweb: http://git.kernel.org/tip/cbda45a2d4798912637b5b792c1c7a97c8d8b080 Author: Fabian Frederick AuthorDate: Fri, 17 Oct 2014 22:01:17 +0200 Committer: H. Peter Anvin CommitDate: Fri, 17 Oct 2014 13:40:51 -0700 x86, cpuid: Use PTR_ERR_OR_ZERO Replace IS_ERR/PTR_ERR Signed-off-by: Fabian Frederick Link: http://lkml.kernel.org/r/1413576077-26969-1-git-send-email-fabf@skynet.be Signed-off-by: H. Peter Anvin --- arch/x86/kernel/cpuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c index 3225ae6c..83741a7 100644 --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c @@ -143,7 +143,7 @@ static int cpuid_device_create(int cpu) dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL, "cpu%d", cpu); - return IS_ERR(dev) ? PTR_ERR(dev) : 0; + return PTR_ERR_OR_ZERO(dev); } static void cpuid_device_destroy(int cpu) -- 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/