OSDN Git Service

ASoC: jz4740: use snd_soc_xxx_active()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 15 May 2020 00:47:27 +0000 (09:47 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 18 May 2020 15:15:10 +0000 (16:15 +0100)
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/87sgg258io.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/jz4740/jz4740-i2s.c

index 6f6f8da..403630b 100644 (file)
@@ -129,7 +129,7 @@ static int jz4740_i2s_startup(struct snd_pcm_substream *substream,
        uint32_t conf, ctrl;
        int ret;
 
-       if (dai->active)
+       if (snd_soc_dai_active(dai))
                return 0;
 
        ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL);
@@ -153,7 +153,7 @@ static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream,
        struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
        uint32_t conf;
 
-       if (dai->active)
+       if (snd_soc_dai_active(dai))
                return;
 
        conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
@@ -332,7 +332,7 @@ static int jz4740_i2s_suspend(struct snd_soc_component *component)
        struct jz4740_i2s *i2s = snd_soc_component_get_drvdata(component);
        uint32_t conf;
 
-       if (component->active) {
+       if (snd_soc_component_active(component)) {
                conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
                conf &= ~JZ_AIC_CONF_ENABLE;
                jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
@@ -355,7 +355,7 @@ static int jz4740_i2s_resume(struct snd_soc_component *component)
        if (ret)
                return ret;
 
-       if (component->active) {
+       if (snd_soc_component_active(component)) {
                ret = clk_prepare_enable(i2s->clk_i2s);
                if (ret) {
                        clk_disable_unprepare(i2s->clk_aic);