[PATCH -next RESEND 1/2] mfd: max77620: Use for_each_child_of_node_scoped()

Jinjie Ruan posted 2 patches 1 year, 3 months ago
[PATCH -next RESEND 1/2] mfd: max77620: Use for_each_child_of_node_scoped()
Posted by Jinjie Ruan 1 year, 3 months ago
Avoids the need for manual cleanup of_node_put() in early exits
from the loop.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 drivers/mfd/max77620.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c
index 74ef3f6d576c..89b30ef91f4f 100644
--- a/drivers/mfd/max77620.c
+++ b/drivers/mfd/max77620.c
@@ -400,7 +400,7 @@ static int max77620_config_fps(struct max77620_chip *chip,
 static int max77620_initialise_fps(struct max77620_chip *chip)
 {
 	struct device *dev = chip->dev;
-	struct device_node *fps_np, *fps_child;
+	struct device_node *fps_np;
 	u8 config;
 	int fps_id;
 	int ret;
@@ -414,10 +414,9 @@ static int max77620_initialise_fps(struct max77620_chip *chip)
 	if (!fps_np)
 		goto skip_fps;
 
-	for_each_child_of_node(fps_np, fps_child) {
+	for_each_child_of_node_scoped(fps_np, fps_child) {
 		ret = max77620_config_fps(chip, fps_child);
 		if (ret < 0) {
-			of_node_put(fps_child);
 			of_node_put(fps_np);
 			return ret;
 		}
-- 
2.34.1
Re: (subset) [PATCH -next RESEND 1/2] mfd: max77620: Use for_each_child_of_node_scoped()
Posted by Lee Jones 1 year, 3 months ago
On Mon, 26 Aug 2024 17:27:33 +0800, Jinjie Ruan wrote:
> Avoids the need for manual cleanup of_node_put() in early exits
> from the loop.
> 
> 

Applied, thanks!

[1/2] mfd: max77620: Use for_each_child_of_node_scoped()
      commit: 2b96330e5ac0426087e34e55494e2c2a6a96a8b2

--
Lee Jones [李琼斯]