From: Zhang Zekun <zhangzekun11@huawei.com>
To: <songxiaowei@hisilicon.com>, <wangbinghui@hisilicon.com>,
<lpieralisi@kernel.org>, <kw@linux.com>,
<manivannan.sadhasivam@linaro.org>, <robh@kernel.org>,
<bhelgaas@google.com>, <linux-pci@vger.kernel.org>,
<ryder.lee@mediatek.com>, <jianjun.wang@mediatek.com>,
<sergio.paracuellos@gmail.com>,
<angelogioacchino.delregno@collabora.com>,
<matthias.bgg@gmail.com>, <alyssa@rosenzweig.io>,
<maz@kernel.org>, <thierry.reding@gmail.com>
Cc: <zhangzekun11@huawei.com>
Subject: [PATCH 2/5] PCI: mediatek: Use helper function for_each_available_child_of_node_scoped()
Date: Wed, 28 Aug 2024 15:38:22 +0800 [thread overview]
Message-ID: <20240828073825.43072-3-zhangzekun11@huawei.com> (raw)
In-Reply-To: <20240828073825.43072-1-zhangzekun11@huawei.com>
for_each_available_child_of_node_scoped() provides a scope-based cleanup
functinality to put the device_node automatically, and we don't need to
call of_node_put() directly. Let's simplify the code a bit with the use
of these functions.
Signed-off-by: Zhang Zekun <zhangzekun11@huawei.com>
---
drivers/pci/controller/pcie-mediatek.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
index 9be3cebd862e..d14e8d151c08 100644
--- a/drivers/pci/controller/pcie-mediatek.c
+++ b/drivers/pci/controller/pcie-mediatek.c
@@ -1042,24 +1042,24 @@ static int mtk_pcie_subsys_powerup(struct mtk_pcie *pcie)
static int mtk_pcie_setup(struct mtk_pcie *pcie)
{
struct device *dev = pcie->dev;
- struct device_node *node = dev->of_node, *child;
+ struct device_node *node = dev->of_node;
struct mtk_pcie_port *port, *tmp;
int err, slot;
slot = of_get_pci_domain_nr(dev->of_node);
if (slot < 0) {
- for_each_available_child_of_node(node, child) {
+ for_each_available_child_of_node_scoped(node, child) {
err = of_pci_get_devfn(child);
if (err < 0) {
dev_err(dev, "failed to get devfn: %d\n", err);
- goto error_put_node;
+ return err;
}
slot = PCI_SLOT(err);
err = mtk_pcie_parse_port(pcie, child, slot);
if (err)
- goto error_put_node;
+ return err;
}
} else {
err = mtk_pcie_parse_port(pcie, node, slot);
@@ -1080,9 +1080,6 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie)
mtk_pcie_subsys_powerdown(pcie);
return 0;
-error_put_node:
- of_node_put(child);
- return err;
}
static int mtk_pcie_probe(struct platform_device *pdev)
--
2.17.1
next prev parent reply other threads:[~2024-08-28 7:51 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-28 7:38 [PATCH 0/5] Simplify code with _scoped() helper functions Zhang Zekun
2024-08-28 7:38 ` [PATCH 1/5] PCI: kirin: Use helper function for_each_available_child_of_node_scoped() Zhang Zekun
2024-08-28 12:11 ` Jonathan Cameron
2024-08-29 1:20 ` zhangzekun (A)
2024-08-28 7:38 ` Zhang Zekun [this message]
2024-08-28 12:16 ` [PATCH 2/5] PCI: mediatek: " Jonathan Cameron
2024-08-28 7:38 ` [PATCH 3/5] PCI: mt7621: " Zhang Zekun
2024-08-28 9:18 ` Sergio Paracuellos
2024-08-28 12:17 ` Jonathan Cameron
2024-08-28 7:38 ` [PATCH 4/5] PCI: apple: Use helper function for_each_child_of_node_scoped() Zhang Zekun
2024-08-28 12:19 ` Jonathan Cameron
2024-08-28 7:38 ` [PATCH 5/5] PCI: tegra: " Zhang Zekun
2024-08-28 12:21 ` Jonathan Cameron
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=20240828073825.43072-3-zhangzekun11@huawei.com \
--to=zhangzekun11@huawei.com \
--cc=alyssa@rosenzweig.io \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bhelgaas@google.com \
--cc=jianjun.wang@mediatek.com \
--cc=kw@linux.com \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=matthias.bgg@gmail.com \
--cc=maz@kernel.org \
--cc=robh@kernel.org \
--cc=ryder.lee@mediatek.com \
--cc=sergio.paracuellos@gmail.com \
--cc=songxiaowei@hisilicon.com \
--cc=thierry.reding@gmail.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