From: Fabian Frederick Date: Fri, 8 Aug 2014 21:22:33 +0000 (-0700) Subject: drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=340f365dd9d74d0ca55089481b9c665955db0aaa;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git drivers/parport/parport_ip32.c: use PTR_ERR_OR_ZERO replace IS_ERR/PTR_ERR Signed-off-by: Fabian Frederick Cc: Wolfram Sang Cc: Linus Walleij Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- 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); } /**