ASoC: bcm: 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/87zhaa58je.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index e6a12e271b071f8a387299c7dea640da0c6be73f..d80b570e950ea7059bff5b37a7c5980d958dd453 100644 (file)
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -653,7 +653,7 @@ static void bcm2835_i2s_stop(struct bcm2835_i2s_dev *dev,
                        BCM2835_I2S_CS_A_REG, mask, 0);
 
        /* Stop also the clock when not SND_SOC_DAIFMT_CONT */
-       if (!dai->active && !(dev->fmt & SND_SOC_DAIFMT_CONT))
+       if (!snd_soc_dai_active(dai) && !(dev->fmt & SND_SOC_DAIFMT_CONT))
                bcm2835_i2s_stop_clock(dev);
 }
 
@@ -695,7 +695,7 @@ static int bcm2835_i2s_startup(struct snd_pcm_substream *substream,
 {
        struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
 
-       if (dai->active)
+       if (snd_soc_dai_active(dai))
                return 0;
 
        /* Should this still be running stop it */
@@ -723,7 +723,7 @@ static void bcm2835_i2s_shutdown(struct snd_pcm_substream *substream,
        bcm2835_i2s_stop(dev, substream, dai);
 
        /* If both streams are stopped, disable module and clock */
-       if (dai->active)
+       if (snd_soc_dai_active(dai))
                return;
 
        /* Disable the module */

diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index 257f5048061ec6244baccc947108a4d4d41fe017..6e634b44829306c87647668bf14f7e4b42f78d92 100644 (file)
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1056,7 +1056,7 @@ static int __cygnus_ssp_suspend(struct snd_soc_dai *cpu_dai)
 {
        struct cygnus_aio_port *aio = cygnus_dai_get_portinfo(cpu_dai);
 
-       if (!cpu_dai->active)
+       if (!snd_soc_dai_active(cpu_dai))
                return 0;
 
        if (!aio->is_slave) {
@@ -1097,7 +1097,7 @@ static int __cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
        struct cygnus_aio_port *aio = cygnus_dai_get_portinfo(cpu_dai);
        int error;
 
-       if (!cpu_dai->active)
+       if (!snd_soc_dai_active(cpu_dai))
                return 0;
 
        if (!aio->is_slave) {