]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
ASoC: soc-dai: add mark for snd_soc_dai_compr_startup/shutdown()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 18 Nov 2020 23:50:04 +0000 (08:50 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 26 Nov 2020 13:09:34 +0000 (13:09 +0000)
commit1e6a93cf74979e167cef8d29f6689705d9ec6735
treee16a9372c4687700ffc3890cf92244184ec9ba1f
parent15a7b8c13653cc88de2db89af486e904aedc75ec
ASoC: soc-dai: add mark for snd_soc_dai_compr_startup/shutdown()

soc_compr_open() does rollback when failed (A),
but, it is almost same as soc_compr_free().

static int soc_compr_open(xxx)
{
...
if (ret < 0)
goto xxx_err;
...
return 0;

 ^ machine_err:
 | ...
 | out:
(A) ...
 | pm_err:
 | ...
 v return ret;
}

The difference is
soc_compr_free()  is for all dai/component/substream,
rollback          is for succeeded part only.

This kind of duplicated code can be a hotbed of bugs,
thus, we want to share soc_compr_free() and rollback.
=> 1) snd_soc_dai_compr_startup/shutdown()
2) snd_soc_component_compr_open/free()
3) snd_soc_link_compr_startup/shutdown()

This patch is for 1) snd_soc_dai_compr_startup/shutdown(),
and adds new cstream mark.
It will mark cstream when startup() was suceeded.
If rollback happen *after* that, it will check rollback flag
and marked cstream.

It cares *previous* startup() only now,
but we might want to check *whole* marked cstream in the future.
This patch is using macro so that it can be easily adjust to it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87mtze5iwp.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc-dai.h
sound/soc/soc-compress.c
sound/soc/soc-dai.c