diff options
| author | Mark Brown <broonie@kernel.org> | 2025-06-09 18:44:13 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-06-09 18:44:13 +0300 |
| commit | d0bdcfcab39029c52c81d4126b1e1e1e91be93a9 (patch) | |
| tree | 24244db4e615fae8f1c0012428cb5daf1ca4f457 /sound/soc/meson/meson-card-utils.c | |
| parent | 4388f5d214cb56833907c0b1f3ddf56ecd3c6d4e (diff) | |
| parent | 111a2c8ab462d77d1519b71b46f13ae1b46920b4 (diff) | |
| download | linux-d0bdcfcab39029c52c81d4126b1e1e1e91be93a9.tar.xz | |
Use helper function for_each_child_of_node_scoped()
Merge series from Ai Chao <aichao@kylinos.cn>:
This patch series introduces wrapper functions for_each_child_of_node_scoped().
The for_each_child_of_node_scoped() helper provides a scope-based clean-up
functionality to put the device_node automatically, and as such, there is
no need to call of_node_put() directly.
Diffstat (limited to 'sound/soc/meson/meson-card-utils.c')
| -rw-r--r-- | sound/soc/meson/meson-card-utils.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index 68531183fb60..cdb759b466ad 100644 --- a/sound/soc/meson/meson-card-utils.c +++ b/sound/soc/meson/meson-card-utils.c @@ -137,7 +137,6 @@ int meson_card_set_be_link(struct snd_soc_card *card, struct device_node *node) { struct snd_soc_dai_link_component *codec; - struct device_node *np; int ret, num_codecs; num_codecs = of_get_child_count(node); @@ -154,19 +153,17 @@ int meson_card_set_be_link(struct snd_soc_card *card, link->codecs = codec; link->num_codecs = num_codecs; - for_each_child_of_node(node, np) { + for_each_child_of_node_scoped(node, np) { ret = meson_card_parse_dai(card, np, codec); - if (ret) { - of_node_put(np); + if (ret) return ret; - } codec++; } ret = meson_card_set_link_name(card, link, node, "be"); if (ret) - dev_err(card->dev, "error setting %pOFn link name\n", np); + dev_err(card->dev, "error setting %pOFn link name\n", node); return ret; } @@ -198,7 +195,6 @@ static int meson_card_add_links(struct snd_soc_card *card) { struct meson_card *priv = snd_soc_card_get_drvdata(card); struct device_node *node = card->dev->of_node; - struct device_node *np; int num, i, ret; num = of_get_child_count(node); @@ -212,12 +208,10 @@ static int meson_card_add_links(struct snd_soc_card *card) return ret; i = 0; - for_each_child_of_node(node, np) { + for_each_child_of_node_scoped(node, np) { ret = priv->match_data->add_link(card, np, &i); - if (ret) { - of_node_put(np); + if (ret) return ret; - } i++; } |