From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Date: Thu, 28 May 2020 14:50:47 +0000 (+0300)
Subject: bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method
X-Git-Tag: v5.8-rc1~138^2~1^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75341b3d358d27f7c22e48bcd92926c49f79e9be;p=thirdparty%2Fkernel%2Flinux.git

bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method

Indeed it's more optimal to use the PTR_ERR_OR_ZERO() macro there instead
of having two return points.

Link: https://lore.kernel.org/r/20200528145050.5203-3-Sergey.Semin@baikalelectronics.ru
Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>
Cc: Olof Johansson <olof@lixom.net>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: soc@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/bus/bt1-apb.c b/drivers/bus/bt1-apb.c
index 59ec5e7077e89..7e57fc2af7458 100644
--- a/drivers/bus/bt1-apb.c
+++ b/drivers/bus/bt1-apb.c
@@ -164,12 +164,10 @@ static int bt1_apb_request_regs(struct bt1_apb *apb)
 	}
 
 	apb->res = devm_platform_ioremap_resource_byname(pdev, "nodev");
-	if (IS_ERR(apb->res)) {
+	if (IS_ERR(apb->res))
 		dev_err(apb->dev, "Couldn't map reserved region\n");
-		return PTR_ERR(apb->res);
-	}
 
-	return 0;
+	return PTR_ERR_OR_ZERO(apb->res);
 }
 
 static int bt1_apb_request_rst(struct bt1_apb *apb)