]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: rawnand: mtk: Use for_each_child_of_node_scoped()
authorJinjie Ruan <ruanjinjie@huawei.com>
Mon, 26 Aug 2024 09:43:25 +0000 (17:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Oct 2024 14:32:41 +0000 (16:32 +0200)
[ Upstream commit 8795952679494b111b7b2ba08bb54ac408daca3b ]

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-8-ruanjinjie@huawei.com
Stable-dep-of: 2073ae37d550 ("mtd: rawnand: mtk: Fix init error path")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/nand/raw/mtk_nand.c

index 17477bb2d48ff0d0b8423f0611fc9d8a9ea27de6..d65e6371675bb19b8bd449ac939b27daa44dd03f 100644 (file)
@@ -1432,15 +1432,12 @@ static int mtk_nfc_nand_chip_init(struct device *dev, struct mtk_nfc *nfc,
 static int mtk_nfc_nand_chips_init(struct device *dev, struct mtk_nfc *nfc)
 {
        struct device_node *np = dev->of_node;
-       struct device_node *nand_np;
        int ret;
 
-       for_each_child_of_node(np, nand_np) {
+       for_each_child_of_node_scoped(np, nand_np) {
                ret = mtk_nfc_nand_chip_init(dev, nfc, nand_np);
-               if (ret) {
-                       of_node_put(nand_np);
+               if (ret)
                        return ret;
-               }
        }
 
        return 0;