ASoC: soc-core: merge card resources cleanup method

Browse source

We need to cleanup card resources when snd_soc_instantiate_card() was
failed, or when snd_soc_unbind_card() was called.
But they are cleanuping card resources on each way.
Same code in many places makes code un-understandable.

This patch reuses soc_cleanup_card_resources() for cleanuping code
resource. Then, it makes avoiding cleanup order.
It will be called from snd_soc_instantiate_card() and
snd_soc_unbind_card().

Then, original soc_cleanup_card_resources() included
snd_soc_flush_all_delayed_work(), but it is now separated.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

...

This commit is contained in:

Kuninori Morimoto 2019-01-21 09:32:42 +09:00 • committed by Mark Brown

parent 65462e445f

commit 53e947a0e1

No known key found for this signature in database

GPG key ID: 24D68B725D5487D0

1 changed files with 43 additions and 60 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

103

sound/soc/soc-core.c

View file