summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-10-17 22:01:17 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2014-10-17 13:40:51 -0700
commitcbda45a2d4798912637b5b792c1c7a97c8d8b080 (patch)
tree68f17a6645f692162da44c372f260a3839879978
parent196cf358422517b3ff3779c46a1f3e26fb084172 (diff)
downloadtalos-obmc-linux-cbda45a2d4798912637b5b792c1c7a97c8d8b080.tar.gz
talos-obmc-linux-cbda45a2d4798912637b5b792c1c7a97c8d8b080.zip
x86, cpuid: Use PTR_ERR_OR_ZERO
Replace IS_ERR/PTR_ERR Signed-off-by: Fabian Frederick <fabf@skynet.be> Link: http://lkml.kernel.org/r/1413576077-26969-1-git-send-email-fabf@skynet.be Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/kernel/cpuid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 3225ae6c5180..83741a71558f 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)
OpenPOWER on IntegriCloud