Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
 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


Reply via email to