On Tue, Mar 17, 2026 at 02:33:25PM +0100, Krzysztof Kozlowski wrote:
Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.
Reviewed-by: Jonathan Cameron <redacted>
Signed-off-by: Krzysztof Kozlowski <redacted>
Applied patches 3 and 4 to pci/hotplug for v7.1, thanks!
Mani will take care of patches 1 and 2.
quoted hunk ↗ jump to hunk
---
Changes in v2:
Tags
---
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 5c020831e318..ff92a5c301b8 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