summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-topology.c
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2023-01-31 02:01:59 +0000
committerMark Brown <broonie@kernel.org>2023-01-31 11:05:11 +0000
commit2b34c1359cca4812d7c8253ff70c394871c22590 (patch)
tree538e425fc8668983f76340d3ec956e42125a7885 /sound/soc/soc-topology.c
parente15ff262e212387a05316dc465d754c0a62d9691 (diff)
downloadlinux-stable-2b34c1359cca4812d7c8253ff70c394871c22590.tar.gz
linux-stable-2b34c1359cca4812d7c8253ff70c394871c22590.tar.bz2
linux-stable-2b34c1359cca4812d7c8253ff70c394871c22590.zip
ASoC: soc-topology.c: use helper function
Current ASoC has many helper function. This patch use it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87edrbea20.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-topology.c')
-rw-r--r--sound/soc/soc-topology.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index e66b0d9e387a..caf547816ea7 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1436,7 +1436,7 @@ widget:
/* card dapm mutex is held by the core if we are loading topology
* data during sound card init. */
- if (card->instantiated)
+ if (snd_soc_card_is_instantiated(card))
widget = snd_soc_dapm_new_control(dapm, &template);
else
widget = snd_soc_dapm_new_control_unlocked(dapm, &template);
@@ -1525,7 +1525,7 @@ static int soc_tplg_dapm_complete(struct soc_tplg *tplg)
/* Card might not have been registered at this point.
* If so, just return success.
*/
- if (!card || !card->instantiated) {
+ if (!snd_soc_card_is_instantiated(card)) {
dev_warn(tplg->dev, "ASoC: Parent card not yet available,"
" widget card binding deferred\n");
return 0;