From: Serge Semin <Sergey.Semin@baikalelectronics.ru>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Serge Semin <Sergey.Semin@baikalelectronics.ru>,
Serge Semin <fancer.lancer@gmail.com>,
Alexey Malahov <Alexey.Malahov@baikalelectronics.ru>,
Olof Johansson <olof@lixom.net>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
<soc@kernel.org>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/6] bus: bt1-axi: Optimize the return points in the driver
Date: Thu, 28 May 2020 17:50:49 +0300 [thread overview]
Message-ID: <20200528145050.5203-5-Sergey.Semin@baikalelectronics.ru> (raw)
In-Reply-To: <20200528145050.5203-1-Sergey.Semin@baikalelectronics.ru>
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.
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-axi.c | 18 ++++++------------
1 file 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,
--
2.26.2
next prev parent reply other threads:[~2020-05-28 14:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 14:50 [PATCH 1/6] bus: bt1-apb: Include linux/io.h Serge Semin
2020-05-28 14:50 ` [PATCH 2/6] bus: bt1-apb: Fix show/store callback identations Serge Semin
2020-05-28 14:50 ` [PATCH 3/6] bus: bt1-apb: Use PTR_ERR_OR_ZERO to return from request-regs method Serge Semin
2020-05-28 14:50 ` [PATCH 4/6] bus: bt1-apb: Use sysfs_streq instead of strncmp Serge Semin
2020-05-28 14:50 ` Serge Semin [this message]
2020-05-28 14:50 ` [PATCH 6/6] bus: bt1-axi: " Serge Semin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200528145050.5203-5-Sergey.Semin@baikalelectronics.ru \
--to=sergey.semin@baikalelectronics.ru \
--cc=Alexey.Malahov@baikalelectronics.ru \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=fancer.lancer@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olof@lixom.net \
--cc=soc@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).