ASoC: soc-dapm.c: use helper function

Current ASoC has many helper function.
This patch use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/87ilgnea2p.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f61c8633e7eb39ab671d943f447e09b592249d03..5d9a671e50f1947f43b37a3c51c07befbce25bc1 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -149,7 +149,7 @@ static int dapm_down_seq[] = {
 
 static void dapm_assert_locked(struct snd_soc_dapm_context *dapm)
 {
-       if (dapm->card && dapm->card->instantiated)
+       if (snd_soc_card_is_instantiated(dapm->card))
                lockdep_assert_held(&dapm->card->dapm_mutex);
 }
 
@@ -1297,7 +1297,7 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
                                      enum snd_soc_dapm_direction))
 {
        struct snd_soc_card *card = dai->component->card;
-       struct snd_soc_dapm_widget *w;
+       struct snd_soc_dapm_widget *w = snd_soc_dai_get_widget(dai, stream);
        LIST_HEAD(widgets);
        int paths;
        int ret;
@@ -1305,12 +1305,10 @@ int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,
        mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
 
        if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
-               w = dai->playback_widget;
                invalidate_paths_ep(w, SND_SOC_DAPM_DIR_OUT);
                paths = is_connected_output_ep(w, &widgets,
                                custom_stop_condition);
        } else {
-               w = dai->capture_widget;
                invalidate_paths_ep(w, SND_SOC_DAPM_DIR_IN);
                paths = is_connected_input_ep(w, &widgets,
                                custom_stop_condition);
@@ -2614,7 +2612,7 @@ int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm)
         * Suppress early reports (eg, jacks syncing their state) to avoid
         * silly DAPM runs during card startup.
         */
-       if (!dapm->card || !dapm->card->instantiated)
+       if (!snd_soc_card_is_instantiated(dapm->card))
                return 0;
 
        return dapm_power_widgets(dapm->card, SND_SOC_DAPM_STREAM_NOP);
@@ -2908,7 +2906,7 @@ static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
                dapm_mark_dirty(path->node[dir], "Route added");
        }
 
-       if (dapm->card->instantiated && path->connect)
+       if (snd_soc_card_is_instantiated(dapm->card) && path->connect)
                dapm_path_invalidate(path);
 
        return 0;
@@ -4229,7 +4227,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
                        return PTR_ERR(w);
 
                w->priv = dai;
-               dai->playback_widget = w;
+               snd_soc_dai_set_widget_playback(dai, w);
        }
 
        if (dai->driver->capture.stream_name) {
@@ -4245,7 +4243,7 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
                        return PTR_ERR(w);
 
                w->priv = dai;
-               dai->capture_widget = w;
+               snd_soc_dai_set_widget_capture(dai, w);
        }
 
        return 0;
@@ -4339,16 +4337,16 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card,
        int stream;
 
        if (dai_link->params) {
-               playback_cpu = cpu_dai->capture_widget;
-               capture_cpu = cpu_dai->playback_widget;
+               playback_cpu    = snd_soc_dai_get_widget_capture(cpu_dai);
+               capture_cpu     = snd_soc_dai_get_widget_playback(cpu_dai);
        } else {
-               playback_cpu = cpu_dai->playback_widget;
-               capture_cpu = cpu_dai->capture_widget;
+               playback_cpu    = snd_soc_dai_get_widget_playback(cpu_dai);
+               capture_cpu     = snd_soc_dai_get_widget_capture(cpu_dai);
        }
 
        /* connect BE DAI playback if widgets are valid */
        stream = SNDRV_PCM_STREAM_PLAYBACK;
-       codec = codec_dai->playback_widget;
+       codec = snd_soc_dai_get_widget(codec_dai, stream);
 
        if (playback_cpu && codec) {
                if (dai_link->params && !rtd->c2c_widget[stream]) {
@@ -4367,7 +4365,7 @@ static void dapm_connect_dai_pair(struct snd_soc_card *card,
 capture:
        /* connect BE DAI capture if widgets are valid */
        stream = SNDRV_PCM_STREAM_CAPTURE;
-       codec = codec_dai->capture_widget;
+       codec = snd_soc_dai_get_widget(codec_dai, stream);
 
        if (codec && capture_cpu) {
                if (dai_link->params && !rtd->c2c_widget[stream]) {