| Message ID | 20250520091131.4150248-5-aichao@kylinos.cn |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Use helper function for_each_child_of_node_scoped() | expand |
Hi Ai,
kernel test robot noticed the following build errors:
[auto build test ERROR on broonie-sound/for-next]
[also build test ERROR on tiwai-sound/for-next tiwai-sound/for-linus wireless-next/main wireless/main linus/master v6.15-rc7 next-20250516]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Ai-Chao/ASoC-ppc-Use-helper-function-for_each_child_of_node_scoped/20250520-171556
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
patch link: https://lore.kernel.org/r/20250520091131.4150248-5-aichao%40kylinos.cn
patch subject: [PATCH 4/6] ASoC: meson: Use helper function for_each_child_of_node_scoped()
config: arc-randconfig-002-20250521 (https://download.01.org/0day-ci/archive/20250521/202505210557.EpJig9BQ-lkp@intel.com/config)
compiler: arc-linux-gcc (GCC) 12.4.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250521/202505210557.EpJig9BQ-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202505210557.EpJig9BQ-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from include/linux/device.h:15,
from include/sound/soc.h:15,
from sound/soc/meson/meson-card-utils.c:8:
sound/soc/meson/meson-card-utils.c: In function 'meson_card_set_be_link':
>> sound/soc/meson/meson-card-utils.c:166:71: error: 'np' undeclared (first use in this function); did you mean 'up'?
166 | dev_err(card->dev, "error setting %pOFn link name\n", np);
| ^~
include/linux/dev_printk.h:110:37: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~~~~~~~~~
sound/soc/meson/meson-card-utils.c:166:17: note: in expansion of macro 'dev_err'
166 | dev_err(card->dev, "error setting %pOFn link name\n", np);
| ^~~~~~~
sound/soc/meson/meson-card-utils.c:166:71: note: each undeclared identifier is reported only once for each function it appears in
166 | dev_err(card->dev, "error setting %pOFn link name\n", np);
| ^~
include/linux/dev_printk.h:110:37: note: in definition of macro 'dev_printk_index_wrap'
110 | _p_func(dev, fmt, ##__VA_ARGS__); \
| ^~~~~~~~~~~
sound/soc/meson/meson-card-utils.c:166:17: note: in expansion of macro 'dev_err'
166 | dev_err(card->dev, "error setting %pOFn link name\n", np);
| ^~~~~~~
vim +166 sound/soc/meson/meson-card-utils.c
aa9c3b7273a58b Jerome Brunet 2020-02-13 134
aa9c3b7273a58b Jerome Brunet 2020-02-13 135 int meson_card_set_be_link(struct snd_soc_card *card,
aa9c3b7273a58b Jerome Brunet 2020-02-13 136 struct snd_soc_dai_link *link,
aa9c3b7273a58b Jerome Brunet 2020-02-13 137 struct device_node *node)
aa9c3b7273a58b Jerome Brunet 2020-02-13 138 {
aa9c3b7273a58b Jerome Brunet 2020-02-13 139 struct snd_soc_dai_link_component *codec;
aa9c3b7273a58b Jerome Brunet 2020-02-13 140 int ret, num_codecs;
aa9c3b7273a58b Jerome Brunet 2020-02-13 141
aa9c3b7273a58b Jerome Brunet 2020-02-13 142 num_codecs = of_get_child_count(node);
aa9c3b7273a58b Jerome Brunet 2020-02-13 143 if (!num_codecs) {
aa9c3b7273a58b Jerome Brunet 2020-02-13 144 dev_err(card->dev, "be link %s has no codec\n",
aa9c3b7273a58b Jerome Brunet 2020-02-13 145 node->full_name);
aa9c3b7273a58b Jerome Brunet 2020-02-13 146 return -EINVAL;
aa9c3b7273a58b Jerome Brunet 2020-02-13 147 }
aa9c3b7273a58b Jerome Brunet 2020-02-13 148
aa9c3b7273a58b Jerome Brunet 2020-02-13 149 codec = devm_kcalloc(card->dev, num_codecs, sizeof(*codec), GFP_KERNEL);
aa9c3b7273a58b Jerome Brunet 2020-02-13 150 if (!codec)
aa9c3b7273a58b Jerome Brunet 2020-02-13 151 return -ENOMEM;
aa9c3b7273a58b Jerome Brunet 2020-02-13 152
aa9c3b7273a58b Jerome Brunet 2020-02-13 153 link->codecs = codec;
aa9c3b7273a58b Jerome Brunet 2020-02-13 154 link->num_codecs = num_codecs;
aa9c3b7273a58b Jerome Brunet 2020-02-13 155
6c05494fd8e28e Ai Chao 2025-05-20 156 for_each_child_of_node_scoped(node, np) {
2e1dbea1f8a358 Kuninori Morimoto 2023-06-20 157 ret = meson_card_parse_dai(card, np, codec);
6c05494fd8e28e Ai Chao 2025-05-20 158 if (ret)
aa9c3b7273a58b Jerome Brunet 2020-02-13 159 return ret;
aa9c3b7273a58b Jerome Brunet 2020-02-13 160
aa9c3b7273a58b Jerome Brunet 2020-02-13 161 codec++;
aa9c3b7273a58b Jerome Brunet 2020-02-13 162 }
aa9c3b7273a58b Jerome Brunet 2020-02-13 163
aa9c3b7273a58b Jerome Brunet 2020-02-13 164 ret = meson_card_set_link_name(card, link, node, "be");
aa9c3b7273a58b Jerome Brunet 2020-02-13 165 if (ret)
aa9c3b7273a58b Jerome Brunet 2020-02-13 @166 dev_err(card->dev, "error setting %pOFn link name\n", np);
aa9c3b7273a58b Jerome Brunet 2020-02-13 167
aa9c3b7273a58b Jerome Brunet 2020-02-13 168 return ret;
aa9c3b7273a58b Jerome Brunet 2020-02-13 169 }
aa9c3b7273a58b Jerome Brunet 2020-02-13 170 EXPORT_SYMBOL_GPL(meson_card_set_be_link);
aa9c3b7273a58b Jerome Brunet 2020-02-13 171
diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c index a2dfccb7990f..b4dca80e15e4 100644 --- a/sound/soc/meson/axg-card.c +++ b/sound/soc/meson/axg-card.c @@ -222,7 +222,6 @@ static int axg_card_parse_codecs_masks(struct snd_soc_card *card, struct axg_dai_link_tdm_data *be) { struct axg_dai_link_tdm_mask *codec_mask; - struct device_node *np; codec_mask = devm_kcalloc(card->dev, link->num_codecs, sizeof(*codec_mask), GFP_KERNEL); @@ -231,7 +230,7 @@ static int axg_card_parse_codecs_masks(struct snd_soc_card *card, be->codec_masks = codec_mask; - for_each_child_of_node(node, np) { + for_each_child_of_node_scoped(node, np) { snd_soc_of_get_slot_mask(np, "dai-tdm-slot-rx-mask", &codec_mask->rx); snd_soc_of_get_slot_mask(np, "dai-tdm-slot-tx-mask", diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c index cfc7f6e41ab5..cf08c8dedd91 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,12 +153,10 @@ 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++; } @@ -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++; }
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. Thus, use this helper to simplify the code. Signed-off-by: Ai Chao <aichao@kylinos.cn> --- sound/soc/meson/axg-card.c | 3 +-- sound/soc/meson/meson-card-utils.c | 14 ++++---------- 2 files changed, 5 insertions(+), 12 deletions(-)