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

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-3-ruanjinjie@huawei.com
drivers/mtd/nand/raw/cadence-nand-controller.c

index ff92c17def83512a540c270a7760f84a81bbf11d..3bc89b3569632d81b5d51e2d1e3fb32e44586bf3 100644 (file)
@@ -2836,7 +2836,6 @@ static void cadence_nand_chips_cleanup(struct cdns_nand_ctrl *cdns_ctrl)
 static int cadence_nand_chips_init(struct cdns_nand_ctrl *cdns_ctrl)
 {
        struct device_node *np = cdns_ctrl->dev->of_node;
-       struct device_node *nand_np;
        int max_cs = cdns_ctrl->caps2.max_banks;
        int nchips, ret;
 
@@ -2849,10 +2848,9 @@ static int cadence_nand_chips_init(struct cdns_nand_ctrl *cdns_ctrl)
                return -EINVAL;
        }
 
-       for_each_child_of_node(np, nand_np) {
+       for_each_child_of_node_scoped(np, nand_np) {
                ret = cadence_nand_chip_init(cdns_ctrl, nand_np);
                if (ret) {
-                       of_node_put(nand_np);
                        cadence_nand_chips_cleanup(cdns_ctrl);
                        return ret;
                }