diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2023-04-06 00:16:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-04-17 12:57:26 +0100 |
| commit | 0f3b818486796ec8895fa4ccdf15edb759bff40a (patch) | |
| tree | 7fc8dba52d49253349467e1f3e896bd6a23aeea6 /sound/soc/soc-core.c | |
| parent | 38e42f6d6c6702bbfc633fce9b579fb80cec2d59 (diff) | |
| download | linux-0f3b818486796ec8895fa4ccdf15edb759bff40a.tar.gz linux-0f3b818486796ec8895fa4ccdf15edb759bff40a.tar.bz2 linux-0f3b818486796ec8895fa4ccdf15edb759bff40a.zip | |
ASoC: add snd_soc_card_mutex_lock/unlock()
ASoC need to use card->mutex with _INIT or _RUNTIME,
but there is no helper function for it.
This patch adds its helper function and use it.
Because people might misunderstand that _init() is mutex initialization,
this patch renames _INIT to _ROOT and adds new
snd_soc_card_mutex_lock_root() for it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a5zlx3tw.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4594505cdae2..b48efc3a08d2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1938,7 +1938,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card) int ret; mutex_lock(&client_mutex); - mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT); + snd_soc_card_mutex_lock_root(card); snd_soc_dapm_init(&card->dapm, card, NULL); @@ -2093,7 +2093,7 @@ probe_end: if (ret < 0) soc_cleanup_card_resources(card); - mutex_unlock(&card->mutex); + snd_soc_card_mutex_unlock(card); mutex_unlock(&client_mutex); return ret; |