summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/msr.c
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-10-18 00:01:38 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-10-18 00:40:53 +0400
commitcba0fdbcff8b54c206c8e18898a55456959ed51a (patch)
treece1810289fcf42c60ed7f2d0270fe3beb24958bd /arch/x86/kernel/msr.c
parent76ef0db72f8b74bb92e24775d9d7f5ab26352bec (diff)
downloadlinux-cba0fdbcff8b54c206c8e18898a55456959ed51a.tar.xz
x86, msr: Use PTR_ERR_OR_ZERO
Replace IS_ERR/PTR_ERR Signed-off-by: Fabian Frederick <fabf@skynet.be> Link: http://lkml.kernel.org/r/1413576099-27059-1-git-send-email-fabf@skynet.be Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/msr.c')
-rw-r--r--arch/x86/kernel/msr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index c9603ac80de5..6e4f77fb6514 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -206,7 +206,7 @@ static int msr_device_create(int cpu)
dev = device_create(msr_class, NULL, MKDEV(MSR_MAJOR, cpu), NULL,
"msr%d", cpu);
- return IS_ERR(dev) ? PTR_ERR(dev) : 0;
+ return PTR_ERR_OR_ZERO(dev);
}
static void msr_device_destroy(int cpu)