summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorSerge Semin <Sergey.Semin@baikalelectronics.ru>2020-05-28 17:50:47 +0300
committerArnd Bergmann <arnd@arndb.de>2020-05-28 16:56:46 +0200
commit75341b3d358d27f7c22e48bcd92926c49f79e9be (patch)
treeac855815cd12183ba8acce4c4e75950101838ee9 /drivers/bus
parentb19dc1b79993a7e6a2c0aa1725f679bb9ae8ad89 (diff)
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>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/bt1-apb.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/bus/bt1-apb.c b/drivers/bus/bt1-apb.c
index 59ec5e7077e8..7e57fc2af745 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)