[tip:x86/cleanups] x86, cpuid: Use PTR_ERR_OR_ZERO

[tip-bot for Fabian Frederick]

Commit-ID:  cbda45a2d4798912637b5b792c1c7a97c8d8b080
Gitweb:     http://git.kernel.org/tip/cbda45a2d4798912637b5b792c1c7a97c8d8b080
Author:     Fabian Frederick <fabf@xxxxxxxxx>
AuthorDate: Fri, 17 Oct 2014 22:01:17 +0200
Committer:  H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
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 <fabf@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1413576077-26969-1-git-send-email-fabf@xxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/