ASoC: cleanup dai / component active code

No one is using dai->active, snd_soc_component_is_active().
Let's remove these.

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

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index f39e1084850e4f7507537e1a898d70963a16fc3a..5663891148e3c22b2e44dd03754d196926294c1f 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -389,12 +389,6 @@ static inline void *snd_soc_component_get_drvdata(struct snd_soc_component *c)
        return dev_get_drvdata(c->dev);
 }
 
-static inline bool snd_soc_component_is_active(
-       struct snd_soc_component *component)
-{
-       return component->active != 0;
-}
-
 static inline unsigned int
 snd_soc_component_active(struct snd_soc_component *component)
 {

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 8826a129ccf95b727ff735a425b2dfe2dc860a91..212257e84facbe1efb36272a74ffe960220c6b9b 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -364,8 +364,6 @@ struct snd_soc_dai {
        /* DAI runtime info */
        unsigned int stream_active[SNDRV_PCM_STREAM_LAST + 1]; /* usage count */
 
-       unsigned int active;
-
        struct snd_soc_dapm_widget *playback_widget;
        struct snd_soc_dapm_widget *capture_widget;
 

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 8172ff42d796de50ead60a8270f3a0fb9b626fe5..ce4e1fd1ab79a789a1b7b04e48c6212e6c472644 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -393,7 +393,7 @@ void snd_soc_dai_action(struct snd_soc_dai *dai,
 {
        /* see snd_soc_dai_stream_active() */
        dai->stream_active[stream]      += action;
-       dai->active                     += action;
+
        /* see snd_soc_component_active() */
        dai->component->active          += action;
 }