summaryrefslogtreecommitdiff
path: root/drivers/bus
diff options
context:
space:
mode:
authorSerge Semin <Sergey.Semin@baikalelectronics.ru>2020-05-28 17:50:49 +0300
committerArnd Bergmann <arnd@arndb.de>2020-05-28 17:57:05 +0300
commit7f57416f2aebe6f8b6ad105b4ca58b347fb2dd2c (patch)
treed09717927356a597da526497317f91275a2e92f5 /drivers/bus
parentb7cb430d5f11b24c1c5809ab46a098ff299b975f (diff)
downloadlinux-7f57416f2aebe6f8b6ad105b4ca58b347fb2dd2c.tar.xz
bus: bt1-axi: Optimize the return points in the driver
It's better to have a single return statement where it's applicable instead of returning from a conditional statement if-clause. Let's do this in the request registers, clock and IRQ methods. Link: https://lore.kernel.org/r/20200528145050.5203-5-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-axi.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/bus/bt1-axi.c b/drivers/bus/bt1-axi.c
index 2005f9174118..c194d9a2bbeb 100644
--- a/drivers/bus/bt1-axi.c
+++ b/drivers/bus/bt1-axi.c
@@ -124,12 +124,10 @@ static int bt1_axi_request_regs(struct bt1_axi *axi)
}
axi->qos_regs = devm_platform_ioremap_resource_byname(pdev, "qos");
- if (IS_ERR(axi->qos_regs)) {
+ if (IS_ERR(axi->qos_regs))
dev_err(dev, "Couldn't map AXI-bus QoS registers\n");
- return PTR_ERR(axi->qos_regs);
- }
- return 0;
+ return PTR_ERR_OR_ZERO(axi->qos_regs);
}
static int bt1_axi_request_rst(struct bt1_axi *axi)
@@ -173,12 +171,10 @@ static int bt1_axi_request_clk(struct bt1_axi *axi)
}
ret = devm_add_action_or_reset(axi->dev, bt1_axi_disable_clk, axi);
- if (ret) {
+ if (ret)
dev_err(axi->dev, "Can't add AXI clock disable action\n");
- return ret;
- }
- return 0;
+ return ret;
}
static int bt1_axi_request_irq(struct bt1_axi *axi)
@@ -192,12 +188,10 @@ static int bt1_axi_request_irq(struct bt1_axi *axi)
ret = devm_request_irq(axi->dev, axi->irq, bt1_axi_isr, IRQF_SHARED,
"bt1-axi", axi);
- if (ret) {
+ if (ret)
dev_err(axi->dev, "Couldn't request AXI EHB IRQ\n");
- return ret;
- }
- return 0;
+ return ret;
}
static ssize_t count_show(struct device *dev,