ASoC: soc-topology.c: use helper function
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 31 Jan 2023 02:01:59 +0000 (02:01 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 31 Jan 2023 11:05:11 +0000 (11:05 +0000)
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>
sound/soc/soc-topology.c

index e66b0d9..caf5478 100644 (file)
@@ -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;