From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: unlisted-recipients:; (no To-header on input)
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
Binghui Wang <wangbinghui@hisilicon.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Rob Herring <robh@kernel.org>,
Xiaowei Song <songxiaowei@hisilicon.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH v2 05/11] PCI: dwc: pcie-kirin: simplify error handling logic
Date: Wed, 3 Feb 2021 08:01:49 +0100 [thread overview]
Message-ID: <6298de2ed4384c2a3f012e9dedc101ae5f184ab2.1612335031.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1612335031.git.mchehab+huawei@kernel.org>
Instead of returning -ENODEV when of_get_named_gpio() fails, make it
return the actual error code.
With that, there's no need anymore to check for -EPROBE_DEFER at
kirin_pcie_probe().
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
---
drivers/pci/controller/dwc/pcie-kirin.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-kirin.c b/drivers/pci/controller/dwc/pcie-kirin.c
index 5925d2b345a8..f46a51ffd2c8 100644
--- a/drivers/pci/controller/dwc/pcie-kirin.c
+++ b/drivers/pci/controller/dwc/pcie-kirin.c
@@ -320,7 +320,7 @@ static long kirin960_pcie_get_resource(struct kirin_pcie *kirin_pcie,
kirin_pcie->gpio_id_reset[0] = of_get_named_gpio(dev->of_node,
"reset-gpios", 0);
if (kirin_pcie->gpio_id_reset[0] < 0)
- return -ENODEV;
+ return kirin_pcie->gpio_id_reset[0];
return 0;
}
@@ -354,22 +354,22 @@ static long kirin970_pcie_get_resource(struct kirin_pcie *kirin_pcie,
kirin_pcie->gpio_id_reset[0] = of_get_named_gpio(dev->of_node,
"switch,reset-gpios", 0);
if (kirin_pcie->gpio_id_reset[0] < 0)
- return -ENODEV;
+ return kirin_pcie->gpio_id_reset[0];
kirin_pcie->gpio_id_reset[1] = of_get_named_gpio(dev->of_node,
"eth,reset-gpios", 0);
if (kirin_pcie->gpio_id_reset[1] < 0)
- return -ENODEV;
+ return kirin_pcie->gpio_id_reset[1];
kirin_pcie->gpio_id_reset[2] = of_get_named_gpio(dev->of_node,
"m_2,reset-gpios", 0);
if (kirin_pcie->gpio_id_reset[2] < 0)
- return -ENODEV;
+ return kirin_pcie->gpio_id_reset[2];
kirin_pcie->gpio_id_reset[3] = of_get_named_gpio(dev->of_node,
"mini1,reset-gpios", 0);
if (kirin_pcie->gpio_id_reset[3] < 0)
- return -ENODEV;
+ return kirin_pcie->gpio_id_reset[3];
ret = devm_gpio_request(dev, kirin_pcie->gpio_id_reset[0],
"pcie_switch_reset");
@@ -1148,11 +1148,7 @@ static int kirin_pcie_probe(struct platform_device *pdev)
if (ret)
return ret;
- kirin_pcie->gpio_id_reset[0] = of_get_named_gpio(dev->of_node,
- "reset-gpios", 0);
- if (kirin_pcie->gpio_id_reset[0] == -EPROBE_DEFER) {
- return -EPROBE_DEFER;
- } else if (!gpio_is_valid(kirin_pcie->gpio_id_reset[0])) {
+ if (!gpio_is_valid(kirin_pcie->gpio_id_reset[0])) {
dev_err(dev, "unable to get a valid gpio pin\n");
return -ENODEV;
}
--
2.29.2
next prev parent reply other threads:[~2021-02-03 7:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-03 7:01 [PATCH v2 00/11] Add support for Hikey 970 PCIe Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 01/11] doc: bindings: PCI: designware-pcie.txt: convert it to YAML Mauro Carvalho Chehab
2021-02-04 15:20 ` Rob Herring
2021-02-03 7:01 ` [PATCH v2 02/11] doc: bindings: kirin-pcie.txt: " Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 03/11] doc: bindings: add new parameters used by Kirin 970 Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 04/11] PCI: dwc: pcie-kirin: add support for Kirin 970 PCIe controller Mauro Carvalho Chehab
2021-02-03 9:32 ` kernel test robot
2021-02-03 14:34 ` Rob Herring
2021-02-03 17:49 ` Mauro Carvalho Chehab
2021-03-26 8:39 ` Mauro Carvalho Chehab
2021-03-26 8:51 ` Manivannan Sadhasivam
2021-03-26 10:04 ` Mauro Carvalho Chehab
2021-07-05 14:54 ` Mauro Carvalho Chehab
2021-02-03 7:01 ` Mauro Carvalho Chehab [this message]
2021-02-03 7:01 ` [PATCH v2 06/11] PCI: dwc: pcie-kirin: simplify Kirin 970 get resource logic Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 07/11] PCI: dwc: pcie-kirin: place common init code altogether Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 08/11] PCI: dwc: pcie-kirin: add support for a regulator Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 09/11] PCI: dwc: pcie-kirin: allow using multiple reset GPIOs Mauro Carvalho Chehab
2021-02-03 13:46 ` Mark Brown
2021-02-03 17:28 ` Mauro Carvalho Chehab
2021-02-03 15:18 ` Krzysztof Wilczyński
2021-02-03 17:50 ` Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 10/11] PCI: dwc: pcie-kirin: add support for clkreq GPIOs Mauro Carvalho Chehab
2021-02-03 7:01 ` [PATCH v2 11/11] pci: dwc: pcie-kirin: cleanup kirin970_pcie_get_eyeparam() Mauro Carvalho Chehab
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=6298de2ed4384c2a3f012e9dedc101ae5f184ab2.1612335031.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=robh@kernel.org \
--cc=songxiaowei@hisilicon.com \
--cc=wangbinghui@hisilicon.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).