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>,
<Jonathan.Cameron@Huawei.com>
Cc: <zhangzekun11@huawei.com>
Subject: [PATCH v3 4/6] PCI: mt7621: Use helper function for_each_available_child_of_node_scoped()
Date: Sat, 31 Aug 2024 12:04:11 +0800 [thread overview]
Message-ID: <20240831040413.126417-5-zhangzekun11@huawei.com> (raw)
In-Reply-To: <20240831040413.126417-1-zhangzekun11@huawei.com>
for_each_available_child_of_node_scoped() provides a scope-based cleanup
functionality 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>
Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
v3: Fix spelling error in commit message.
v2: Use dev_perr_probe to simplify code.
drivers/pci/controller/pcie-mt7621.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c
index 9b4754a45515..354d401428f0 100644
--- a/drivers/pci/controller/pcie-mt7621.c
+++ b/drivers/pci/controller/pcie-mt7621.c
@@ -258,30 +258,25 @@ static int mt7621_pcie_parse_dt(struct mt7621_pcie *pcie)
{
struct device *dev = pcie->dev;
struct platform_device *pdev = to_platform_device(dev);
- struct device_node *node = dev->of_node, *child;
+ struct device_node *node = dev->of_node;
int err;
pcie->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(pcie->base))
return PTR_ERR(pcie->base);
- for_each_available_child_of_node(node, child) {
+ for_each_available_child_of_node_scoped(node, child) {
int slot;
err = of_pci_get_devfn(child);
- if (err < 0) {
- of_node_put(child);
- dev_err(dev, "failed to parse devfn: %d\n", err);
- return err;
- }
+ if (err < 0)
+ return dev_err_probe(dev, err, "failed to parse devfn\n");
slot = PCI_SLOT(err);
err = mt7621_pcie_parse_port(pcie, child, slot);
- if (err) {
- of_node_put(child);
+ if (err)
return err;
- }
}
return 0;
--
2.17.1
next prev parent reply other threads:[~2024-08-31 4:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-31 4:04 [PATCH v3 0/6] Simplify code with _scoped() helper functions Zhang Zekun
2024-08-31 4:04 ` [PATCH v3 1/6] PCI: kirin: Use helper function for_each_available_child_of_node_scoped() Zhang Zekun
2025-03-05 5:49 ` Manivannan Sadhasivam
2024-08-31 4:04 ` [PATCH v3 2/6] PCI: kirin: Tidy up _probe() related function with dev_err_probe() Zhang Zekun
2025-03-05 5:54 ` Manivannan Sadhasivam
2025-03-05 11:24 ` Krzysztof Wilczyński
2025-03-06 9:45 ` Krzysztof Wilczyński
2024-08-31 4:04 ` [PATCH v3 3/6] PCI: mediatek: Use helper function for_each_available_child_of_node_scoped() Zhang Zekun
2025-03-05 5:55 ` Manivannan Sadhasivam
2024-08-31 4:04 ` Zhang Zekun [this message]
2025-03-05 5:56 ` [PATCH v3 4/6] PCI: mt7621: " Manivannan Sadhasivam
2024-08-31 4:04 ` [PATCH v3 5/6] PCI: apple: Use helper function for_each_child_of_node_scoped() Zhang Zekun
2025-03-05 5:57 ` Manivannan Sadhasivam
2024-08-31 4:04 ` [PATCH v3 6/6] PCI: tegra: " Zhang Zekun
2025-03-05 5:59 ` Manivannan Sadhasivam
2025-03-02 18:32 ` [PATCH v3 0/6] Simplify code with _scoped() helper functions Krzysztof Wilczyński
2025-03-05 11:25 ` Krzysztof Wilczyński
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=20240831040413.126417-5-zhangzekun11@huawei.com \
--to=zhangzekun11@huawei.com \
--cc=Jonathan.Cameron@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