ASoC: ti: 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>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/87mu6a58i3.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 7a7db743dc5b5a4ccd066b16ccd25ebf910eb481..b93c1ee302c0c438ee10228033ac85ff4dec5730 100644 (file)
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -1577,7 +1577,7 @@ static void davinci_mcasp_shutdown(struct snd_pcm_substream *substream,
        if (mcasp->op_mode == DAVINCI_MCASP_DIT_MODE)
                return;
 
-       if (!cpu_dai->active) {
+       if (!snd_soc_dai_active(cpu_dai)) {
                mcasp->channels = 0;
                mcasp->max_format_width = 0;
        }

diff --git a/sound/soc/ti/omap-dmic.c b/sound/soc/ti/omap-dmic.c
index 913579c43e9d4a26b7cdfa3be4596895cace864a..01abf1be5d788c0d602a7c0d486b33acbd9a55c3 100644 (file)
--- a/sound/soc/ti/omap-dmic.c
+++ b/sound/soc/ti/omap-dmic.c
@@ -95,7 +95,7 @@ static int omap_dmic_dai_startup(struct snd_pcm_substream *substream,
 
        mutex_lock(&dmic->mutex);
 
-       if (!dai->active)
+       if (!snd_soc_dai_active(dai))
                dmic->active = 1;
        else
                ret = -EBUSY;
@@ -114,7 +114,7 @@ static void omap_dmic_dai_shutdown(struct snd_pcm_substream *substream,
 
        cpu_latency_qos_remove_request(&dmic->pm_qos_req);
 
-       if (!dai->active)
+       if (!snd_soc_dai_active(dai))
                dmic->active = 0;
 
        mutex_unlock(&dmic->mutex);

diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c
index 6c83b9888467a51ecb360892ab7c7581787c3034..4e67769b795aa4acf3636885384e4e8ca7858803 100644 (file)
--- a/sound/soc/ti/omap-mcbsp.c
+++ b/sound/soc/ti/omap-mcbsp.c
@@ -786,7 +786,7 @@ static int omap_mcbsp_dai_startup(struct snd_pcm_substream *substream,
        struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
        int err = 0;
 
-       if (!cpu_dai->active)
+       if (!snd_soc_dai_active(cpu_dai))
                err = omap_mcbsp_request(mcbsp);
 
        /*
@@ -841,7 +841,7 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream,
 
        mcbsp->latency[stream1] = 0;
 
-       if (!cpu_dai->active) {
+       if (!snd_soc_dai_active(cpu_dai)) {
                omap_mcbsp_free(mcbsp);
                mcbsp->configured = 0;
        }

diff --git a/sound/soc/ti/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
index f2dbadea33bb2506f1cf8619531266543f6dd7bb..d482b62f314a60dc6cf7183098f247a3f8e7333d 100644 (file)
--- a/sound/soc/ti/omap-mcpdm.c
+++ b/sound/soc/ti/omap-mcpdm.c
@@ -253,7 +253,7 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
 
        mutex_lock(&mcpdm->mutex);
 
-       if (!dai->active)
+       if (!snd_soc_dai_active(dai))
                omap_mcpdm_open_streams(mcpdm);
 
        mutex_unlock(&mcpdm->mutex);
@@ -271,7 +271,7 @@ static void omap_mcpdm_dai_shutdown(struct snd_pcm_substream *substream,
 
        mutex_lock(&mcpdm->mutex);
 
-       if (!dai->active) {
+       if (!snd_soc_dai_active(dai)) {
                if (omap_mcpdm_active(mcpdm)) {
                        omap_mcpdm_stop(mcpdm);
                        omap_mcpdm_close_streams(mcpdm);
@@ -462,7 +462,7 @@ static int omap_mcpdm_suspend(struct snd_soc_component *component)
 {
        struct omap_mcpdm *mcpdm = snd_soc_component_get_drvdata(component);
 
-       if (component->active) {
+       if (snd_soc_component_active(component)) {
                omap_mcpdm_stop(mcpdm);
                omap_mcpdm_close_streams(mcpdm);
        }
@@ -484,7 +484,7 @@ static int omap_mcpdm_resume(struct snd_soc_component *component)
                while (mcpdm->pm_active_count--)
                        pm_runtime_get_sync(mcpdm->dev);
 
-               if (component->active) {
+               if (snd_soc_component_active(component)) {
                        omap_mcpdm_open_streams(mcpdm);
                        omap_mcpdm_start(mcpdm);
                }