From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 8 Aug 2014 21:22:33 +0000 (-0700)
Subject: drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO
X-Git-Tag: firefly_0821_release~176^2~3441^2~102
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=340f365dd9d74d0ca55089481b9c665955db0aaa;p=firefly-linux-kernel-4.4.55.git

drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO

replace IS_ERR/PTR_ERR

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c
index c864f82bd37d..30e981be14c2 100644
--- a/drivers/parport/parport_ip32.c
+++ b/drivers/parport/parport_ip32.c
@@ -2204,7 +2204,7 @@ static int __init parport_ip32_init(void)
 {
 	pr_info(PPIP32 "SGI IP32 built-in parallel port driver v0.6\n");
 	this_port = parport_ip32_probe_port();
-	return IS_ERR(this_port) ? PTR_ERR(this_port) : 0;
+	return PTR_ERR_OR_ZERO(this_port);
 }
 
 /**