mtd: rawnand: marvell: drm/rockchip: Use for_each_child_of_node_scoped()

Avoids the need for manual cleanup of_node_put() in early exits
from the loop.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240826094328.2991664-5-ruanjinjie@huawei.com

diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index 5b0f5a9cef81b5fbc1494cb9f00b123ea06f0d35..26648b72e691f407caca33d9a78e23b586c46a74 100644 (file)
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -2771,7 +2771,6 @@ static void marvell_nand_chips_cleanup(struct marvell_nfc *nfc)
 static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc)
 {
        struct device_node *np = dev->of_node;
-       struct device_node *nand_np;
        int max_cs = nfc->caps->max_cs_nb;
        int nchips;
        int ret;
@@ -2798,20 +2797,15 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc)
                return ret;
        }
 
-       for_each_child_of_node(np, nand_np) {
+       for_each_child_of_node_scoped(np, nand_np) {
                ret = marvell_nand_chip_init(dev, nfc, nand_np);
                if (ret) {
-                       of_node_put(nand_np);
-                       goto cleanup_chips;
+                       marvell_nand_chips_cleanup(nfc);
+                       return ret;
                }
        }
 
        return 0;
-
-cleanup_chips:
-       marvell_nand_chips_cleanup(nfc);
-
-       return ret;
 }
 
 static int marvell_nfc_init_dma(struct marvell_nfc *nfc)