ASoC: soc-pcm: add soc_pcm_clean() and call it from soc_pcm_open/close()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 28 Sep 2020 00:01:24 +0000 (09:01 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 28 Sep 2020 16:01:45 +0000 (17:01 +0100)
commit140a4532cdb8c44a664e7e871ea5dbaa4c2829bc
treee815e6dd712dc7353a3f6b57e6e871482a7ffc5f
parent939a5cfb2a5609d2d6f996b5cd853397a82a92b9
ASoC: soc-pcm: add soc_pcm_clean() and call it from soc_pcm_open/close()

soc_pcm_open() does rollback when failed (A),
but, it is almost same as soc_pcm_close().

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

 ^ config_err:
 | ...
 | rtd_startup_err:
(A) ...
 | component_err:
 | ...
 v return ret;
}

The difference is
soc_pcm_close() 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_pcm_close() and rollback.

Now, soc_pcm_open/close() are handling
1) snd_soc_dai_startup/shutdown()
2) snd_soc_link_startup/shutdown()
3) snd_soc_component_module_get/put()
4) snd_soc_component_open/close()
5) pm_runtime_put/get()

Now, 1) to 5) are handled.
This patch adds new soc_pcm_clean() and call it from
soc_pcm_open() as rollback, and from soc_pcm_close() as
normal close handler.

One note here is that it don't need to call snd_soc_runtime_deactivate()
when rollback case, because it will be called without
snd_soc_runtime_activate().
It also don't need to call snd_soc_dapm_stream_stop() when rollback case.

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