]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mtd: rawnand: renesas: Use for_each_child_of_node_scoped()
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 26 Aug 2024 09:43:26 +0000 (17:43 +0800)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Fri, 6 Sep 2024 14:59:54 +0000 (16:59 +0200)
Avoids the need for manual cleanup of_node_put() in early exits
from the loop.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240826094328.2991664-9-ruanjinjie@huawei.com
drivers/mtd/nand/raw/renesas-nand-controller.c

index c9a01feff8dfe53f98e3ca23be4da1672c21da18..0e92d50c5249b0f8be7d0ad177f2367becb74a8e 100644 (file)
@@ -1297,23 +1297,17 @@ static void rnandc_chips_cleanup(struct rnandc *rnandc)
 
 static int rnandc_chips_init(struct rnandc *rnandc)
 {
-       struct device_node *np;
        int ret;
 
-       for_each_child_of_node(rnandc->dev->of_node, np) {
+       for_each_child_of_node_scoped(rnandc->dev->of_node, np) {
                ret = rnandc_chip_init(rnandc, np);
                if (ret) {
-                       of_node_put(np);
-                       goto cleanup_chips;
+                       rnandc_chips_cleanup(rnandc);
+                       return ret;
                }
        }
 
        return 0;
-
-cleanup_chips:
-       rnandc_chips_cleanup(rnandc);
-
-       return ret;
 }
 
 static int rnandc_probe(struct platform_device *pdev)