* [PATCH 2/3] PCI: pnv_php: Simplify with scoped for each OF child loop
2026-01-02 12:49 [PATCH 1/3] PCI: mvebu: Simplify with scoped for each OF child loop Krzysztof Kozlowski
@ 2026-01-02 12:49 ` Krzysztof Kozlowski
2026-01-05 10:36 ` Jonathan Cameron
2026-01-02 12:49 ` [PATCH 3/3] PCI: rpaphp: " Krzysztof Kozlowski
2026-01-05 10:35 ` [PATCH 1/3] PCI: mvebu: " Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2026-01-02 12:49 UTC (permalink / raw)
To: Thomas Petazzoni, Pali Rohár, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Christophe Leroy (CS GROUP), Tyrel Datwyler,
linux-pci, linux-arm-kernel, linux-kernel, linuxppc-dev
Cc: Krzysztof Kozlowski
Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
drivers/pci/hotplug/pnv_php.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index c5345bff9a55..0d80bee284e0 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -215,24 +215,19 @@ static void pnv_php_reverse_nodes(struct device_node *parent)
static int pnv_php_populate_changeset(struct of_changeset *ocs,
struct device_node *dn)
{
- struct device_node *child;
- int ret = 0;
+ int ret;
- for_each_child_of_node(dn, child) {
+ for_each_child_of_node_scoped(dn, child) {
ret = of_changeset_attach_node(ocs, child);
- if (ret) {
- of_node_put(child);
- break;
- }
+ if (ret)
+ return ret;
ret = pnv_php_populate_changeset(ocs, child);
- if (ret) {
- of_node_put(child);
- break;
- }
+ if (ret)
+ return ret;
}
- return ret;
+ return 0;
}
static void *pnv_php_add_one_pdn(struct device_node *dn, void *data)
--
2.51.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] PCI: pnv_php: Simplify with scoped for each OF child loop
2026-01-02 12:49 ` [PATCH 2/3] PCI: pnv_php: " Krzysztof Kozlowski
@ 2026-01-05 10:36 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2026-01-05 10:36 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Thomas Petazzoni, Pali Rohár, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Christophe Leroy (CS GROUP), Tyrel Datwyler,
linux-pci, linux-arm-kernel, linux-kernel, linuxppc-dev
On Fri, 2 Jan 2026 13:49:02 +0100
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> wrote:
> Use scoped for-each loop when iterating over device nodes to make code a
> bit simpler.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
> ---
> drivers/pci/hotplug/pnv_php.c | 19 +++++++------------
> 1 file changed, 7 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
> index c5345bff9a55..0d80bee284e0 100644
> --- a/drivers/pci/hotplug/pnv_php.c
> +++ b/drivers/pci/hotplug/pnv_php.c
> @@ -215,24 +215,19 @@ static void pnv_php_reverse_nodes(struct device_node *parent)
> static int pnv_php_populate_changeset(struct of_changeset *ocs,
> struct device_node *dn)
> {
> - struct device_node *child;
> - int ret = 0;
> + int ret;
>
> - for_each_child_of_node(dn, child) {
> + for_each_child_of_node_scoped(dn, child) {
> ret = of_changeset_attach_node(ocs, child);
> - if (ret) {
> - of_node_put(child);
> - break;
> - }
> + if (ret)
> + return ret;
>
> ret = pnv_php_populate_changeset(ocs, child);
> - if (ret) {
> - of_node_put(child);
> - break;
> - }
> + if (ret)
> + return ret;
> }
>
> - return ret;
> + return 0;
> }
>
> static void *pnv_php_add_one_pdn(struct device_node *dn, void *data)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] PCI: rpaphp: Simplify with scoped for each OF child loop
2026-01-02 12:49 [PATCH 1/3] PCI: mvebu: Simplify with scoped for each OF child loop Krzysztof Kozlowski
2026-01-02 12:49 ` [PATCH 2/3] PCI: pnv_php: " Krzysztof Kozlowski
@ 2026-01-02 12:49 ` Krzysztof Kozlowski
2026-01-05 10:37 ` Jonathan Cameron
2026-01-05 10:35 ` [PATCH 1/3] PCI: mvebu: " Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2026-01-02 12:49 UTC (permalink / raw)
To: Thomas Petazzoni, Pali Rohár, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Christophe Leroy (CS GROUP), Tyrel Datwyler,
linux-pci, linux-arm-kernel, linux-kernel, linuxppc-dev
Cc: Krzysztof Kozlowski
Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
drivers/pci/hotplug/rpaphp_slot.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 779eab12e981..dc0e29c4fad3 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -82,7 +82,6 @@ EXPORT_SYMBOL_GPL(rpaphp_deregister_slot);
int rpaphp_register_slot(struct slot *slot)
{
struct hotplug_slot *php_slot = &slot->hotplug_slot;
- struct device_node *child;
u32 my_index;
int retval;
int slotno = -1;
@@ -97,11 +96,10 @@ int rpaphp_register_slot(struct slot *slot)
return -EAGAIN;
}
- for_each_child_of_node(slot->dn, child) {
+ for_each_child_of_node_scoped(slot->dn, child) {
retval = of_property_read_u32(child, "ibm,my-drc-index", &my_index);
if (my_index == slot->index) {
slotno = PCI_SLOT(PCI_DN(child)->devfn);
- of_node_put(child);
break;
}
}
--
2.51.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/3] PCI: rpaphp: Simplify with scoped for each OF child loop
2026-01-02 12:49 ` [PATCH 3/3] PCI: rpaphp: " Krzysztof Kozlowski
@ 2026-01-05 10:37 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2026-01-05 10:37 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Thomas Petazzoni, Pali Rohár, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Christophe Leroy (CS GROUP), Tyrel Datwyler,
linux-pci, linux-arm-kernel, linux-kernel, linuxppc-dev
On Fri, 2 Jan 2026 13:49:03 +0100
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> wrote:
> Use scoped for-each loop when iterating over device nodes to make code a
> bit simpler.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] PCI: mvebu: Simplify with scoped for each OF child loop
2026-01-02 12:49 [PATCH 1/3] PCI: mvebu: Simplify with scoped for each OF child loop Krzysztof Kozlowski
2026-01-02 12:49 ` [PATCH 2/3] PCI: pnv_php: " Krzysztof Kozlowski
2026-01-02 12:49 ` [PATCH 3/3] PCI: rpaphp: " Krzysztof Kozlowski
@ 2026-01-05 10:35 ` Jonathan Cameron
2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2026-01-05 10:35 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Thomas Petazzoni, Pali Rohár, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam, Rob Herring,
Bjorn Helgaas, Madhavan Srinivasan, Michael Ellerman,
Nicholas Piggin, Christophe Leroy (CS GROUP), Tyrel Datwyler,
linux-pci, linux-arm-kernel, linux-kernel, linuxppc-dev
On Fri, 2 Jan 2026 13:49:01 +0100
Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> wrote:
> Use scoped for-each loop when iterating over device nodes to make code a
> bit simpler.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Hi Krzysztof,
Drive by review. Your changes are functionally equivalent and lgtm.
However, I am curious at whether the lack of reference count for child
when stashed in port->dn (and then used in the for loop) is a potential
issue.
Jonathan
> ---
> drivers/pci/controller/pci-mvebu.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c
> index a72aa57591c0..4d3c97b62fe0 100644
> --- a/drivers/pci/controller/pci-mvebu.c
> +++ b/drivers/pci/controller/pci-mvebu.c
> @@ -1452,7 +1452,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
> struct mvebu_pcie *pcie;
> struct pci_host_bridge *bridge;
> struct device_node *np = dev->of_node;
> - struct device_node *child;
> int num, i, ret;
>
> bridge = devm_pci_alloc_host_bridge(dev, sizeof(struct mvebu_pcie));
> @@ -1474,16 +1473,14 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> i = 0;
> - for_each_available_child_of_node(np, child) {
> + for_each_available_child_of_node_scoped(np, child) {
> struct mvebu_pcie_port *port = &pcie->ports[i];
>
> ret = mvebu_pcie_parse_port(pcie, port, child);
> - if (ret < 0) {
> - of_node_put(child);
> + if (ret < 0)
> return ret;
> - } else if (ret == 0) {
> + else if (ret == 0)
> continue;
> - }
>
> port->dn = child;
> i++;
> @@ -1493,6 +1490,7 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
> for (i = 0; i < pcie->nports; i++) {
> struct mvebu_pcie_port *port = &pcie->ports[i];
> int irq = port->intx_irq;
> + struct device_node *child;
>
> child = port->dn;
> if (!child)
^ permalink raw reply [flat|nested] 6+ messages in thread