ASoC: use snd_soc_xxx_active()

We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/8736826n44.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index def3ae78b4a7de817991a8a8b967da6ae0c6b39e..62ece729e425c9c6515a4f658fa2bc3a541fcabd 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -231,10 +231,10 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
 
        snd_soc_dai_digital_mute(codec_dai, 1, cstream->direction);
 
-       if (!cpu_dai->active)
+       if (!snd_soc_dai_active(cpu_dai))
                cpu_dai->rate = 0;
 
-       if (!codec_dai->active)
+       if (!snd_soc_dai_active(codec_dai))
                codec_dai->rate = 0;
 
        if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 95d8189e45abbeaf4345226ff500f1d5e381542c..e697258d2ffc55b91b3c55f7a8925dd162b890f0 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -372,7 +372,8 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
        dev_dbg(rtd->dev,
                "ASoC: pop wq checking: %s status: %s waiting: %s\n",
                codec_dai->driver->playback.stream_name,
-               codec_dai->stream_active[playback] ? "active" : "inactive",
+               snd_soc_dai_stream_active(codec_dai, playback) ?
+               "active" : "inactive",
                rtd->pop_wait ? "yes" : "no");
 
        /* are we waiting on this codec DAI stream */
@@ -546,7 +547,7 @@ int snd_soc_suspend(struct device *dev)
                        continue;
 
                for_each_rtd_codec_dais(rtd, i, dai) {
-                       if (dai->stream_active[playback])
+                       if (snd_soc_dai_stream_active(dai, playback))
                                snd_soc_dai_digital_mute(dai, 1, playback);
                }
        }
@@ -688,7 +689,7 @@ static void soc_resume_deferred(struct work_struct *work)
                        continue;
 
                for_each_rtd_codec_dais(rtd, i, dai) {
-                       if (dai->stream_active[playback])
+                       if (snd_soc_dai_stream_active(dai, playback))
                                snd_soc_dai_digital_mute(dai, 0, playback);
                }
        }
@@ -718,7 +719,7 @@ int snd_soc_resume(struct device *dev)
 
        /* activate pins from sleep state */
        for_each_card_components(card, component)
-               if (component->active)
+               if (snd_soc_component_active(component))
                        pinctrl_pm_select_default_state(component->dev);
 
        dev_dbg(dev, "ASoC: Scheduling resume work\n");
@@ -1943,7 +1944,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
 
        /* deactivate pins to sleep state */
        for_each_card_components(card, component)
-               if (!component->active)
+               if (!snd_soc_component_active(component))
                        pinctrl_pm_select_sleep_state(component->dev);
 
 probe_end:

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8d414f0ae2f93348fdf63c6c266f3cf4196fc2dd..b7899da4217e68747f9c6b22913970fee895517f 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -750,7 +750,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
        }
 
        for_each_rtd_components(rtd, i, component)
-               if (!component->active)
+               if (!snd_soc_component_active(component))
                        pinctrl_pm_select_sleep_state(component->dev);
 
        return 0;
@@ -844,7 +844,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
 
        /* Symmetry only applies if we've already got an active stream. */
        for_each_rtd_dais(rtd, i, dai) {
-               if (dai->active) {
+               if (snd_soc_dai_active(dai)) {
                        ret = soc_pcm_apply_symmetry(substream, dai);
                        if (ret != 0)
                                goto config_err;
@@ -882,7 +882,7 @@ component_err:
        }
 
        for_each_rtd_components(rtd, i, component)
-               if (!component->active)
+               if (!snd_soc_component_active(component))
                        pinctrl_pm_select_sleep_state(component->dev);
 
        return ret;
@@ -1136,9 +1136,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
 
        /* clear the corresponding DAIs parameters when going to be inactive */
        for_each_rtd_dais(rtd, i, dai) {
-               int active = dai->stream_active[substream->stream];
+               int active = snd_soc_dai_stream_active(dai, substream->stream);
 
-               if (dai->active == 1) {
+               if (snd_soc_dai_active(dai) == 1) {
                        dai->rate = 0;
                        dai->channels = 0;
                        dai->sample_bits = 0;
@@ -1907,7 +1907,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
 
        for_each_rtd_cpu_dais (fe, i, fe_cpu_dai) {
                /* Symmetry only applies if we've got an active stream. */
-               if (fe_cpu_dai->active) {
+               if (snd_soc_dai_active(fe_cpu_dai)) {
                        err = soc_pcm_apply_symmetry(fe_substream, fe_cpu_dai);
                        if (err < 0)
                                return err;
@@ -1936,7 +1936,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
 
                /* Symmetry only applies if we've got an active stream. */
                for_each_rtd_dais(rtd, i, dai) {
-                       if (dai->active) {
+                       if (snd_soc_dai_active(dai)) {
                                err = soc_pcm_apply_symmetry(fe_substream, dai);
                                if (err < 0)
                                        return err;
@@ -2709,7 +2709,7 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
                return 0;
 
        /* only check active links */
-       if (!asoc_rtd_to_cpu(fe, 0)->active)
+       if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0)))
                return 0;
 
        /* DAPM sync will call this to update DSP paths */
@@ -2724,8 +2724,8 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
                        continue;
 
                /* skip if FE isn't currently playing/capturing */
-               if (!asoc_rtd_to_cpu(fe, 0)->stream_active[stream] ||
-                   !asoc_rtd_to_codec(fe, 0)->stream_active[stream])
+               if (!snd_soc_dai_stream_active(asoc_rtd_to_cpu(fe, 0), stream) ||
+                   !snd_soc_dai_stream_active(asoc_rtd_to_codec(fe, 0), stream))
                        continue;
 
                paths = dpcm_path_get(fe, stream, &list);