]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mtd: rawnand: rockchip: Use for_each_child_of_node_scoped()
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 26 Aug 2024 09:43:23 +0000 (17:43 +0800)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Fri, 6 Sep 2024 14:59:48 +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>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240826094328.2991664-6-ruanjinjie@huawei.com
drivers/mtd/nand/raw/rockchip-nand-controller.c

index 55580447633be0704e4ab88aacdb5b4f34e90f25..51c9cf9013dc2805960c4cabfab36ec9bbe192f2 100644 (file)
@@ -1211,7 +1211,7 @@ static void rk_nfc_chips_cleanup(struct rk_nfc *nfc)
 
 static int rk_nfc_nand_chips_init(struct device *dev, struct rk_nfc *nfc)
 {
-       struct device_node *np = dev->of_node, *nand_np;
+       struct device_node *np = dev->of_node;
        int nchips = of_get_child_count(np);
        int ret;
 
@@ -1221,10 +1221,9 @@ static int rk_nfc_nand_chips_init(struct device *dev, struct rk_nfc *nfc)
                return -EINVAL;
        }
 
-       for_each_child_of_node(np, nand_np) {
+       for_each_child_of_node_scoped(np, nand_np) {
                ret = rk_nfc_nand_chip_init(dev, nfc, nand_np);
                if (ret) {
-                       of_node_put(nand_np);
                        rk_nfc_chips_cleanup(nfc);
                        return ret;
                }