[PATCH v3 2/6] ALSA: aoa: Use helper function for_each_child_of_node_scoped()
From: Ai Chao <hidden>
Date: 2025-05-27 08:25:18
Also in:
imx, linux-amlogic, linux-arm-kernel, linux-arm-msm, linux-renesas-soc, linux-sound, lkml
Subsystem:
aoa (apple onboard audio) alsa driver, sound, the rest · Maintainers:
Johannes Berg, Jaroslav Kysela, Takashi Iwai, Linus Torvalds
The for_each_child_of_node_scoped() helper provides a scope-based clean-up functionality to put the device_node automatically. Signed-off-by: Ai Chao <redacted> --- sound/aoa/soundbus/i2sbus/core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index ce84288168e4..c1bd0565fc51 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c@@ -155,7 +155,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, struct device_node *np) { struct i2sbus_dev *dev; - struct device_node *child, *sound = NULL; + struct device_node *sound = NULL; struct resource *r; int i, layout = 0, rlen, ok = force; char node_name[8];
@@ -178,7 +178,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, return 0; i = 0; - for_each_child_of_node(np, child) { + for_each_child_of_node_scoped(np, child) { if (of_node_name_eq(child, "sound")) { i++; sound = child;
@@ -335,7 +335,6 @@ static int i2sbus_add_dev(struct macio_dev *macio, static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) { - struct device_node *np; int got = 0, err; struct i2sbus_control *control = NULL;
@@ -347,7 +346,7 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) return -ENODEV; } - for_each_child_of_node(dev->ofdev.dev.of_node, np) { + for_each_child_of_node_scoped(dev->ofdev.dev.of_node, np) { if (of_device_is_compatible(np, "i2sbus") || of_device_is_compatible(np, "i2s-modem")) { got += i2sbus_add_dev(dev, control, np);
--
2.47.1