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

[tip-bot for Fabian Frederick]

Commit-ID:  cba0fdbcff8b54c206c8e18898a55456959ed51a
Gitweb:     http://git.kernel.org/tip/cba0fdbcff8b54c206c8e18898a55456959ed51a
Author:     Fabian Frederick <fabf@xxxxxxxxx>
AuthorDate: Fri, 17 Oct 2014 22:01:38 +0200
Committer:  H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
CommitDate: Fri, 17 Oct 2014 13:40:53 -0700

x86, msr: Use PTR_ERR_OR_ZERO

Replace IS_ERR/PTR_ERR

Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1413576099-27059-1-git-send-email-fabf@xxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
---
 arch/x86/kernel/msr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index c9603ac..6e4f77f 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)
--
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/