[PATCH v2 04/21] ASoC: soc-dai: add snd_soc_dai_active()
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Thu May 14 10:39:08 CEST 2020
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Current snd_soc_dai_action() is updating
dai->stream_active for Playback/Capture (A),
dai->active for DAI (B)
void snd_soc_dai_action(struct snd_soc_dai *dai,
int stream, int action)
{
(A) dai->stream_active[stream] += action;
(B) dai->active += action;
dai->component->active += action;
}
But, these are very verbose, because we can calculate
DAI active from stream_active.
This patch adds snd_soc_dai_active() which calculate
DAI active from DAI stream_active.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
v1 -> v2
- function name "xxx_activity" -> "xxx_active"
include/sound/soc-dai.h | 1 +
sound/soc/soc-dai.c | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 019c222a0b0d..e651c62636ab 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -165,6 +165,7 @@ void snd_soc_dai_action(struct snd_soc_dai *dai,
int stream, int action);
#define snd_soc_dai_activate(dai, stream) snd_soc_dai_action(dai, stream, 1)
#define snd_soc_dai_deactivate(dai, stream) snd_soc_dai_action(dai, stream, -1)
+int snd_soc_dai_active(struct snd_soc_dai *dai);
int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order);
int snd_soc_pcm_dai_remove(struct snd_soc_pcm_runtime *rtd, int order);
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 3208f244c1b8..de2981fa5372 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -397,6 +397,18 @@ void snd_soc_dai_action(struct snd_soc_dai *dai,
}
EXPORT_SYMBOL_GPL(snd_soc_dai_action);
+int snd_soc_dai_active(struct snd_soc_dai *dai)
+{
+ int stream, active;
+
+ active = 0;
+ for_each_pcm_streams(stream)
+ active += dai->stream_active[stream];
+
+ return active;
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_active);
+
int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order)
{
struct snd_soc_dai *dai;
--
2.17.1
More information about the Alsa-devel
mailing list