[PATCH] ASoC: soc-core: move snd_soc_dai_link_set_capabilities() to soc-core.c

Kuninori Morimoto kuninori.morimoto.gx at renesas.com
Tue Aug 25 02:15:51 CEST 2020


Hi Mark

> From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
> 
> commit 25612477d20b52 ("ASoC: soc-dai: set dai_link dpcm_ flags with a helper")
> added snd_soc_dai_link_set_capabilities().
> But it is using snd_soc_find_dai() (A) which is required client_mutex (B).
> And client_mutex is soc-core.c local.
(snip)
> Because not only snd_soc_dai_link_set_capabilities() but many drivers
> are already using snd_soc_find_dai(),
> 1st idea for this issue was creating snd_soc_find_dai() of
> _with_mutex / _without_mutex, but it was not enough and/or confusable.
> 
> soc-dai.c which is implemented snd_soc_dai_link_set_capabilities() currently is
> mainly for snd_soc_dai related functions, not for snd_soc_dai_link.
> Thus as 2nd idea, this patch moves snd_soc_dai_link_set_capabilities()
> from soc-dai.c to soc-core.c, and use mutex_lock().
> 
> Fixes: 25612477d20b52 ("ASoC: soc-dai: set dai_link dpcm_ flags with a helper")
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
> ---

This is for mark/for-5.9, but I noticed that
your for-5.9 branch doesn't have this commit

	4f8721542f7b75954bfad98c51aa59d683d35b50
	("ASoC: core: use less strict tests for dailink capabilities")

But, linus/master (= v5.9-rc2) has it.
And I noticed that your for-5.10 branch has it.

Which branch should I use for linus/master (= v5.9-rcX) ?


Thank you for your help !!

Best regards
---
Kuninori Morimoto


More information about the Alsa-devel mailing list