From: Jinjie Ruan <ruanjinjie@huawei.com>
Date: Mon, 26 Aug 2024 09:43:24 +0000 (+0800)
Subject: mtd: rawnand: meson: Use for_each_child_of_node_scoped()
X-Git-Tag: v6.12-rc1~159^2^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee06c7821d0426d0f998593cbc442757247e7cd6;p=thirdparty%2Fkernel%2Flinux.git

mtd: rawnand: meson: 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-7-ruanjinjie@huawei.com
---

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 9eb5470344d09..8806a06462ac6 100644
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -1495,14 +1495,12 @@ static int meson_nfc_nand_chips_init(struct device *dev,
 				     struct meson_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 = meson_nfc_nand_chip_init(dev, nfc, nand_np);
 		if (ret) {
 			meson_nfc_nand_chip_cleanup(nfc);
-			of_node_put(nand_np);
 			return ret;
 		}
 	}