From: Robin Murphy <robin.murphy@arm.com>
To: shawn.lin@rock-chips.com, lorenzo.pieralisi@arm.com,
andrew.murray@arm.com
Cc: bhelgaas@google.com, heiko@sntech.de, lgirdwood@gmail.com,
broonie@kernel.org, linux-pci@vger.kernel.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] PCI: rockchip: Simplify optional regulator handling
Date: Sat, 16 Nov 2019 12:54:20 +0000 [thread overview]
Message-ID: <347bc3ef8399577e4cef3fdbf3af34d20b4ad27e.1573908530.git.robin.murphy@arm.com> (raw)
In-Reply-To: <1eebc002101931012d337cda23d18f85b0326361.1573908530.git.robin.murphy@arm.com>
Null checks are both cheaper and more readable than having !IS_ERR()
splattered everywhere.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/pci/controller/pcie-rockchip-host.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
index 68525f8ac4d9..a61819efc0c1 100644
--- a/drivers/pci/controller/pcie-rockchip-host.c
+++ b/drivers/pci/controller/pcie-rockchip-host.c
@@ -262,7 +262,7 @@ static void rockchip_pcie_set_power_limit(struct rockchip_pcie *rockchip)
int curr;
u32 status, scale, power;
- if (IS_ERR(rockchip->vpcie3v3))
+ if (!rockchip->vpcie3v3)
return;
/*
@@ -611,6 +611,7 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip)
if (PTR_ERR(rockchip->vpcie12v) != -ENODEV)
return PTR_ERR(rockchip->vpcie12v);
dev_info(dev, "no vpcie12v regulator found\n");
+ rockchip->vpcie12v = NULL;
}
rockchip->vpcie3v3 = devm_regulator_get_optional(dev, "vpcie3v3");
@@ -618,6 +619,7 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip)
if (PTR_ERR(rockchip->vpcie3v3) != -ENODEV)
return PTR_ERR(rockchip->vpcie3v3);
dev_info(dev, "no vpcie3v3 regulator found\n");
+ rockchip->vpcie3v3 = NULL;
}
rockchip->vpcie1v8 = devm_regulator_get(dev, "vpcie1v8");
@@ -636,7 +638,7 @@ static int rockchip_pcie_set_vpcie(struct rockchip_pcie *rockchip)
struct device *dev = rockchip->dev;
int err;
- if (!IS_ERR(rockchip->vpcie12v)) {
+ if (rockchip->vpcie12v) {
err = regulator_enable(rockchip->vpcie12v);
if (err) {
dev_err(dev, "fail to enable vpcie12v regulator\n");
@@ -644,7 +646,7 @@ static int rockchip_pcie_set_vpcie(struct rockchip_pcie *rockchip)
}
}
- if (!IS_ERR(rockchip->vpcie3v3)) {
+ if (rockchip->vpcie3v3) {
err = regulator_enable(rockchip->vpcie3v3);
if (err) {
dev_err(dev, "fail to enable vpcie3v3 regulator\n");
@@ -669,10 +671,10 @@ static int rockchip_pcie_set_vpcie(struct rockchip_pcie *rockchip)
err_disable_1v8:
regulator_disable(rockchip->vpcie1v8);
err_disable_3v3:
- if (!IS_ERR(rockchip->vpcie3v3))
+ if (rockchip->vpcie3v3)
regulator_disable(rockchip->vpcie3v3);
err_disable_12v:
- if (!IS_ERR(rockchip->vpcie12v))
+ if (rockchip->vpcie12v)
regulator_disable(rockchip->vpcie12v);
err_out:
return err;
@@ -1062,9 +1064,9 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
err_deinit_port:
rockchip_pcie_deinit_phys(rockchip);
err_vpcie:
- if (!IS_ERR(rockchip->vpcie12v))
+ if (rockchip->vpcie12v)
regulator_disable(rockchip->vpcie12v);
- if (!IS_ERR(rockchip->vpcie3v3))
+ if (rockchip->vpcie3v3)
regulator_disable(rockchip->vpcie3v3);
regulator_disable(rockchip->vpcie1v8);
regulator_disable(rockchip->vpcie0v9);
@@ -1087,9 +1089,9 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
rockchip_pcie_disable_clocks(rockchip);
- if (!IS_ERR(rockchip->vpcie12v))
+ if (rockchip->vpcie12v)
regulator_disable(rockchip->vpcie12v);
- if (!IS_ERR(rockchip->vpcie3v3))
+ if (rockchip->vpcie3v3)
regulator_disable(rockchip->vpcie3v3);
regulator_disable(rockchip->vpcie1v8);
regulator_disable(rockchip->vpcie0v9);
--
2.17.1
next prev parent reply other threads:[~2019-11-16 12:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-16 12:54 [PATCH 1/2] PCI: rockchip: Make some regulators non-optional Robin Murphy
2019-11-16 12:54 ` Robin Murphy [this message]
2019-11-18 11:59 ` [PATCH 2/2] PCI: rockchip: Simplify optional regulator handling Mark Brown
2019-11-18 12:20 ` Robin Murphy
2019-11-18 12:39 ` Andrew Murray
2019-11-18 13:10 ` Robin Murphy
2019-11-18 13:17 ` Andrew Murray
2019-11-18 14:24 ` Bjorn Helgaas
2019-11-18 18:15 ` Lorenzo Pieralisi
2019-11-18 18:38 ` Mark Brown
2019-11-18 11:57 ` [PATCH 1/2] PCI: rockchip: Make some regulators non-optional Mark Brown
2019-11-18 12:28 ` Andrew Murray
2019-11-20 17:05 ` Lorenzo Pieralisi
2020-11-07 11:36 ` Qu Wenruo
2020-11-07 11:57 ` Qu Wenruo
2020-11-07 12:47 ` Robin Murphy
2020-11-07 12:54 ` Qu Wenruo
2020-11-07 13:30 ` Qu Wenruo
2020-11-09 12:00 ` Robin Murphy
2020-11-09 12:38 ` Qu Wenruo
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=347bc3ef8399577e4cef3fdbf3af34d20b4ad27e.1573908530.git.robin.murphy@arm.com \
--to=robin.murphy@arm.com \
--cc=andrew.murray@arm.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=heiko@sntech.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=shawn.lin@rock-chips.com \
/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).