Message ID | 20200528145050.5203-3-Sergey.Semin@baikalelectronics.ru (mailing list archive) |
---|---|
State | Mainlined |
Commit | 75341b3d358d27f7c22e48bcd92926c49f79e9be |
Headers | show |
Series | [1/6] bus: bt1-apb: Include linux/io.h | expand |
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)
Indeed it's more optimal to use the PTR_ERR_OR_ZERO() macro there instead of having two return points. 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 --- drivers/bus/bt1-apb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)