* [PATCH v2 01/21] ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
@ 2020-05-14 8:37 ` Kuninori Morimoto
2020-05-14 10:41 ` Mark Brown
2020-05-14 8:37 ` [PATCH v2 02/21] ASoC: soc-dai: add snd_soc_dai_action() Kuninori Morimoto
` (20 subsequent siblings)
21 siblings, 1 reply; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:37 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
snd_soc_runtime_activate()/deactivate() are implemented by global funtion
which are just calling snd_soc_runtime_action().
We can replace it to macro, and this patch do it.
This patch is prepare for xxx_active cleanup.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- new patch
include/sound/soc.h | 9 +++++++--
sound/soc/soc-pcm.c | 49 ++++++++++++++-------------------------------
2 files changed, 22 insertions(+), 36 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 69a82487fa9b..2a05c7555047 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -468,8 +468,13 @@ struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link);
bool snd_soc_runtime_ignore_pmdown_time(struct snd_soc_pcm_runtime *rtd);
-void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream);
-void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);
+
+void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
+ int stream, int action);
+#define snd_soc_runtime_activate(rtd, stream)\
+ snd_soc_runtime_action(rtd, stream, 1)
+#define snd_soc_runtime_deactivate(rtd, stream)\
+ snd_soc_runtime_action(rtd, stream, -1)
int snd_soc_runtime_calc_hw(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hardware *hw, int stream);
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 440c7e87829a..e7175afd9a73 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -256,8 +256,20 @@ static int soc_rtd_trigger(struct snd_soc_pcm_runtime *rtd,
return 0;
}
-static void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
- int stream, int action)
+/**
+ * snd_soc_runtime_action() - Increment/Decrement active count for
+ * PCM runtime components
+ * @rtd: ASoC PCM runtime that is activated
+ * @stream: Direction of the PCM stream
+ *
+ * Increments/Decrements the active count for all the DAIs and components
+ * attached to a PCM runtime.
+ * Should typically be called when a stream is opened.
+ *
+ * Must be called with the rtd->card->pcm_mutex being held
+ */
+void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
+ int stream, int action)
{
struct snd_soc_dai *dai;
int i;
@@ -270,38 +282,7 @@ static void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
dai->component->active += action;
}
}
-
-/**
- * snd_soc_runtime_activate() - Increment active count for PCM runtime components
- * @rtd: ASoC PCM runtime that is activated
- * @stream: Direction of the PCM stream
- *
- * Increments the active count for all the DAIs and components attached to a PCM
- * runtime. Should typically be called when a stream is opened.
- *
- * Must be called with the rtd->card->pcm_mutex being held
- */
-void snd_soc_runtime_activate(struct snd_soc_pcm_runtime *rtd, int stream)
-{
- snd_soc_runtime_action(rtd, stream, 1);
-}
-EXPORT_SYMBOL_GPL(snd_soc_runtime_activate);
-
-/**
- * snd_soc_runtime_deactivate() - Decrement active count for PCM runtime components
- * @rtd: ASoC PCM runtime that is deactivated
- * @stream: Direction of the PCM stream
- *
- * Decrements the active count for all the DAIs and components attached to a PCM
- * runtime. Should typically be called when a stream is closed.
- *
- * Must be called with the rtd->card->pcm_mutex being held
- */
-void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream)
-{
- snd_soc_runtime_action(rtd, stream, -1);
-}
-EXPORT_SYMBOL_GPL(snd_soc_runtime_deactivate);
+EXPORT_SYMBOL_GPL(snd_soc_runtime_action);
/**
* snd_soc_runtime_ignore_pmdown_time() - Check whether to ignore the power down delay
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v2 01/21] ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro
2020-05-14 8:37 ` [PATCH v2 01/21] ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro Kuninori Morimoto
@ 2020-05-14 10:41 ` Mark Brown
2020-05-14 23:35 ` Kuninori Morimoto
0 siblings, 1 reply; 26+ messages in thread
From: Mark Brown @ 2020-05-14 10:41 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
On Thu, May 14, 2020 at 05:37:32PM +0900, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> snd_soc_runtime_activate()/deactivate() are implemented by global funtion
> which are just calling snd_soc_runtime_action().
> We can replace it to macro, and this patch do it.
> This patch is prepare for xxx_active cleanup.
It'd be better to use static inline functions rather than macros -
unlike the loop iterators there's no C syntax reason not to use an
inline and inline functions provide better type safety and namespacing.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v2 01/21] ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro
2020-05-14 10:41 ` Mark Brown
@ 2020-05-14 23:35 ` Kuninori Morimoto
0 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 23:35 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
Hi Mark
> > snd_soc_runtime_activate()/deactivate() are implemented by global funtion
> > which are just calling snd_soc_runtime_action().
> > We can replace it to macro, and this patch do it.
> > This patch is prepare for xxx_active cleanup.
>
> It'd be better to use static inline functions rather than macros -
> unlike the loop iterators there's no C syntax reason not to use an
> inline and inline functions provide better type safety and namespacing.
Oh, yes, indeed.
Will post v3 patch
Thank you for your help !!
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 02/21] ASoC: soc-dai: add snd_soc_dai_action()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
2020-05-14 8:37 ` [PATCH v2 01/21] ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro Kuninori Morimoto
@ 2020-05-14 8:37 ` Kuninori Morimoto
2020-05-14 8:38 ` [PATCH v2 03/21] ASoC: soc-dapm: use snd_soc_dai_activate()/deactivate() Kuninori Morimoto
` (19 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:37 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
snd_soc_runtime_action() updates DAI's xxx_acitve.
We should update these in the same time, and
it can be implemented at soc-dai.c.
This patch adds snd_soc_dai_action() for it.
This is prepare for xxx_active cleanup.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- new patch
include/sound/soc-dai.h | 4 ++++
sound/soc/soc-dai.c | 9 +++++++++
sound/soc/soc-pcm.c | 7 ++-----
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 2a0a5af1c1ae..019c222a0b0d 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -161,6 +161,10 @@ void snd_soc_dai_resume(struct snd_soc_dai *dai);
int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
struct snd_soc_pcm_runtime *rtd, int num);
bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
+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_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 8e5fe012aa1d..3208f244c1b8 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -388,6 +388,15 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)
return stream->channels_min;
}
+void snd_soc_dai_action(struct snd_soc_dai *dai,
+ int stream, int action)
+{
+ dai->stream_active[stream] += action;
+ dai->active += action;
+ dai->component->active += action;
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_action);
+
int snd_soc_pcm_dai_probe(struct snd_soc_pcm_runtime *rtd, int order)
{
struct snd_soc_dai *dai;
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index e7175afd9a73..8d414f0ae2f9 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -276,11 +276,8 @@ void snd_soc_runtime_action(struct snd_soc_pcm_runtime *rtd,
lockdep_assert_held(&rtd->card->pcm_mutex);
- for_each_rtd_dais(rtd, i, dai) {
- dai->stream_active[stream] += action;
- dai->active += action;
- dai->component->active += action;
- }
+ for_each_rtd_dais(rtd, i, dai)
+ snd_soc_dai_action(dai, stream, action);
}
EXPORT_SYMBOL_GPL(snd_soc_runtime_action);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 03/21] ASoC: soc-dapm: use snd_soc_dai_activate()/deactivate()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
2020-05-14 8:37 ` [PATCH v2 01/21] ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro Kuninori Morimoto
2020-05-14 8:37 ` [PATCH v2 02/21] ASoC: soc-dai: add snd_soc_dai_action() Kuninori Morimoto
@ 2020-05-14 8:38 ` Kuninori Morimoto
2020-05-14 8:39 ` [PATCH v2 04/21] ASoC: soc-dai: add snd_soc_dai_active() Kuninori Morimoto
` (18 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:38 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
soc-dapm.c :: snd_soc_dai_link_event_pre_pmu() / snd_soc_dai_link_event()
are directly updating dai->active without caring about
stream_active / component->active.
It is breaking xxx_active count balance.
This patch uses snd_soc_dai_action() for it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- new patch
sound/soc/soc-dapm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 80658d13a855..a4de3e4bc2ef 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3835,7 +3835,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
"ASoC: startup() failed: %d\n", ret);
goto out;
}
- source->active++;
+ snd_soc_dai_activate(source, substream->stream);
}
substream->stream = SNDRV_PCM_STREAM_PLAYBACK;
@@ -3848,7 +3848,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w,
"ASoC: startup() failed: %d\n", ret);
goto out;
}
- sink->active++;
+ snd_soc_dai_activate(sink, substream->stream);
}
substream->hw_opened = 1;
@@ -3978,14 +3978,14 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
substream->stream = SNDRV_PCM_STREAM_CAPTURE;
snd_soc_dapm_widget_for_each_source_path(w, path) {
source = path->source->priv;
- source->active--;
+ snd_soc_dai_deactivate(source, substream->stream);
snd_soc_dai_shutdown(source, substream);
}
substream->stream = SNDRV_PCM_STREAM_PLAYBACK;
snd_soc_dapm_widget_for_each_sink_path(w, path) {
sink = path->sink->priv;
- sink->active--;
+ snd_soc_dai_deactivate(sink, substream->stream);
snd_soc_dai_shutdown(sink, substream);
}
break;
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 04/21] ASoC: soc-dai: add snd_soc_dai_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (2 preceding siblings ...)
2020-05-14 8:38 ` [PATCH v2 03/21] ASoC: soc-dapm: use snd_soc_dai_activate()/deactivate() Kuninori Morimoto
@ 2020-05-14 8:39 ` Kuninori Morimoto
2020-05-14 8:39 ` [PATCH v2 05/21] ASoC: soc-component: add snd_soc_component_active() Kuninori Morimoto
` (17 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:39 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@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@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
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 05/21] ASoC: soc-component: add snd_soc_component_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (3 preceding siblings ...)
2020-05-14 8:39 ` [PATCH v2 04/21] ASoC: soc-dai: add snd_soc_dai_active() Kuninori Morimoto
@ 2020-05-14 8:39 ` Kuninori Morimoto
2020-05-14 8:40 ` [PATCH v2 06/21] ASoC: soc-dai: add snd_soc_dai_stream_active() Kuninori Morimoto
` (16 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:39 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- not update component->active via macro
include/sound/soc-component.h | 1 +
sound/soc/soc-dai.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 864983b09846..820b9b618f97 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -394,6 +394,7 @@ static inline bool snd_soc_component_is_active(
{
return component->active != 0;
}
+#define snd_soc_component_active(component) ((component)->active)
/* component pin */
int snd_soc_component_enable_pin(struct snd_soc_component *component,
diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index de2981fa5372..bb771302fd6f 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -393,6 +393,7 @@ void snd_soc_dai_action(struct snd_soc_dai *dai,
{
dai->stream_active[stream] += action;
dai->active += action;
+ /* see snd_soc_component_active() */
dai->component->active += action;
}
EXPORT_SYMBOL_GPL(snd_soc_dai_action);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 06/21] ASoC: soc-dai: add snd_soc_dai_stream_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (4 preceding siblings ...)
2020-05-14 8:39 ` [PATCH v2 05/21] ASoC: soc-component: add snd_soc_component_active() Kuninori Morimoto
@ 2020-05-14 8:40 ` Kuninori Morimoto
2020-05-14 8:40 ` [PATCH v2 07/21] ASoC: use snd_soc_xxx_active() Kuninori Morimoto
` (15 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:40 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- new patch
- not update dai->active via macro
include/sound/soc-dai.h | 1 +
sound/soc/soc-dai.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e651c62636ab..d55dd0474096 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -166,6 +166,7 @@ void snd_soc_dai_action(struct snd_soc_dai *dai,
#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);
+#define snd_soc_dai_stream_active(dai, stream) ((dai)->stream_active[stream])
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 bb771302fd6f..8172ff42d796 100644
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -391,6 +391,7 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir)
void snd_soc_dai_action(struct snd_soc_dai *dai,
int stream, int action)
{
+ /* see snd_soc_dai_stream_active() */
dai->stream_active[stream] += action;
dai->active += action;
/* see snd_soc_component_active() */
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 07/21] ASoC: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (5 preceding siblings ...)
2020-05-14 8:40 ` [PATCH v2 06/21] ASoC: soc-dai: add snd_soc_dai_stream_active() Kuninori Morimoto
@ 2020-05-14 8:40 ` Kuninori Morimoto
2020-05-14 8:41 ` [PATCH v2 08/21] ASoC: atomel: " Kuninori Morimoto
` (14 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:40 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/soc-compress.c | 4 ++--
sound/soc/soc-core.c | 11 ++++++-----
sound/soc/soc-pcm.c | 20 ++++++++++----------
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index def3ae78b4a7..62ece729e425 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -231,10 +231,10 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
snd_soc_dai_digital_mute(codec_dai, 1, cstream->direction);
- if (!cpu_dai->active)
+ if (!snd_soc_dai_active(cpu_dai))
cpu_dai->rate = 0;
- if (!codec_dai->active)
+ if (!snd_soc_dai_active(codec_dai))
codec_dai->rate = 0;
if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 95d8189e45ab..e697258d2ffc 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -372,7 +372,8 @@ void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd)
dev_dbg(rtd->dev,
"ASoC: pop wq checking: %s status: %s waiting: %s\n",
codec_dai->driver->playback.stream_name,
- codec_dai->stream_active[playback] ? "active" : "inactive",
+ snd_soc_dai_stream_active(codec_dai, playback) ?
+ "active" : "inactive",
rtd->pop_wait ? "yes" : "no");
/* are we waiting on this codec DAI stream */
@@ -546,7 +547,7 @@ int snd_soc_suspend(struct device *dev)
continue;
for_each_rtd_codec_dais(rtd, i, dai) {
- if (dai->stream_active[playback])
+ if (snd_soc_dai_stream_active(dai, playback))
snd_soc_dai_digital_mute(dai, 1, playback);
}
}
@@ -688,7 +689,7 @@ static void soc_resume_deferred(struct work_struct *work)
continue;
for_each_rtd_codec_dais(rtd, i, dai) {
- if (dai->stream_active[playback])
+ if (snd_soc_dai_stream_active(dai, playback))
snd_soc_dai_digital_mute(dai, 0, playback);
}
}
@@ -718,7 +719,7 @@ int snd_soc_resume(struct device *dev)
/* activate pins from sleep state */
for_each_card_components(card, component)
- if (component->active)
+ if (snd_soc_component_active(component))
pinctrl_pm_select_default_state(component->dev);
dev_dbg(dev, "ASoC: Scheduling resume work\n");
@@ -1943,7 +1944,7 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
/* deactivate pins to sleep state */
for_each_card_components(card, component)
- if (!component->active)
+ if (!snd_soc_component_active(component))
pinctrl_pm_select_sleep_state(component->dev);
probe_end:
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8d414f0ae2f9..b7899da4217e 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -750,7 +750,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
}
for_each_rtd_components(rtd, i, component)
- if (!component->active)
+ if (!snd_soc_component_active(component))
pinctrl_pm_select_sleep_state(component->dev);
return 0;
@@ -844,7 +844,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
/* Symmetry only applies if we've already got an active stream. */
for_each_rtd_dais(rtd, i, dai) {
- if (dai->active) {
+ if (snd_soc_dai_active(dai)) {
ret = soc_pcm_apply_symmetry(substream, dai);
if (ret != 0)
goto config_err;
@@ -882,7 +882,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
}
for_each_rtd_components(rtd, i, component)
- if (!component->active)
+ if (!snd_soc_component_active(component))
pinctrl_pm_select_sleep_state(component->dev);
return ret;
@@ -1136,9 +1136,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
/* clear the corresponding DAIs parameters when going to be inactive */
for_each_rtd_dais(rtd, i, dai) {
- int active = dai->stream_active[substream->stream];
+ int active = snd_soc_dai_stream_active(dai, substream->stream);
- if (dai->active == 1) {
+ if (snd_soc_dai_active(dai) == 1) {
dai->rate = 0;
dai->channels = 0;
dai->sample_bits = 0;
@@ -1907,7 +1907,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
for_each_rtd_cpu_dais (fe, i, fe_cpu_dai) {
/* Symmetry only applies if we've got an active stream. */
- if (fe_cpu_dai->active) {
+ if (snd_soc_dai_active(fe_cpu_dai)) {
err = soc_pcm_apply_symmetry(fe_substream, fe_cpu_dai);
if (err < 0)
return err;
@@ -1936,7 +1936,7 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream,
/* Symmetry only applies if we've got an active stream. */
for_each_rtd_dais(rtd, i, dai) {
- if (dai->active) {
+ if (snd_soc_dai_active(dai)) {
err = soc_pcm_apply_symmetry(fe_substream, dai);
if (err < 0)
return err;
@@ -2709,7 +2709,7 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
return 0;
/* only check active links */
- if (!asoc_rtd_to_cpu(fe, 0)->active)
+ if (!snd_soc_dai_active(asoc_rtd_to_cpu(fe, 0)))
return 0;
/* DAPM sync will call this to update DSP paths */
@@ -2724,8 +2724,8 @@ static int soc_dpcm_fe_runtime_update(struct snd_soc_pcm_runtime *fe, int new)
continue;
/* skip if FE isn't currently playing/capturing */
- if (!asoc_rtd_to_cpu(fe, 0)->stream_active[stream] ||
- !asoc_rtd_to_codec(fe, 0)->stream_active[stream])
+ if (!snd_soc_dai_stream_active(asoc_rtd_to_cpu(fe, 0), stream) ||
+ !snd_soc_dai_stream_active(asoc_rtd_to_codec(fe, 0), stream))
continue;
paths = dpcm_path_get(fe, stream, &list);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 08/21] ASoC: atomel: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (6 preceding siblings ...)
2020-05-14 8:40 ` [PATCH v2 07/21] ASoC: use snd_soc_xxx_active() Kuninori Morimoto
@ 2020-05-14 8:41 ` Kuninori Morimoto
2020-05-14 8:41 ` [PATCH v2 09/21] ASoC: bcm: " Kuninori Morimoto
` (13 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:41 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/atmel/atmel_ssc_dai.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index 1073f468f21f..0f18dfb85bfe 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -765,7 +765,7 @@ static int atmel_ssc_suspend(struct snd_soc_component *component)
struct atmel_ssc_info *ssc_p;
struct platform_device *pdev = to_platform_device(component->dev);
- if (!component->active)
+ if (!snd_soc_component_active(component))
return 0;
ssc_p = &ssc_info[pdev->id];
@@ -793,7 +793,7 @@ static int atmel_ssc_resume(struct snd_soc_component *component)
struct platform_device *pdev = to_platform_device(component->dev);
u32 cr;
- if (!component->active)
+ if (!snd_soc_component_active(component))
return 0;
ssc_p = &ssc_info[pdev->id];
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 09/21] ASoC: bcm: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (7 preceding siblings ...)
2020-05-14 8:41 ` [PATCH v2 08/21] ASoC: atomel: " Kuninori Morimoto
@ 2020-05-14 8:41 ` Kuninori Morimoto
2020-05-14 8:41 ` [PATCH v2 10/21] ASoC: cirrus: " Kuninori Morimoto
` (12 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:41 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/bcm/bcm2835-i2s.c | 6 +++---
sound/soc/bcm/cygnus-ssp.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index e6a12e271b07..d80b570e950e 100644
--- 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 257f5048061e..6e634b448293 100644
--- 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) {
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 10/21] ASoC: cirrus: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (8 preceding siblings ...)
2020-05-14 8:41 ` [PATCH v2 09/21] ASoC: bcm: " Kuninori Morimoto
@ 2020-05-14 8:41 ` Kuninori Morimoto
2020-05-14 8:41 ` [PATCH v2 11/21] ASoC: codecs: " Kuninori Morimoto
` (11 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:41 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/cirrus/ep93xx-i2s.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 723f4cf19467..371708b17c09 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -368,7 +368,7 @@ static int ep93xx_i2s_suspend(struct snd_soc_component *component)
{
struct ep93xx_i2s_info *info = snd_soc_component_get_drvdata(component);
- if (!component->active)
+ if (!snd_soc_component_active(component))
return 0;
ep93xx_i2s_disable(info, SNDRV_PCM_STREAM_PLAYBACK);
@@ -381,7 +381,7 @@ static int ep93xx_i2s_resume(struct snd_soc_component *component)
{
struct ep93xx_i2s_info *info = snd_soc_component_get_drvdata(component);
- if (!component->active)
+ if (!snd_soc_component_active(component))
return 0;
ep93xx_i2s_enable(info, SNDRV_PCM_STREAM_PLAYBACK);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 11/21] ASoC: codecs: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (9 preceding siblings ...)
2020-05-14 8:41 ` [PATCH v2 10/21] ASoC: cirrus: " Kuninori Morimoto
@ 2020-05-14 8:41 ` Kuninori Morimoto
2020-05-14 8:42 ` [PATCH v2 12/21] ASoC: fsl: " Kuninori Morimoto
` (10 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:41 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/codecs/adav80x.c | 4 ++--
sound/soc/codecs/arizona.c | 2 +-
sound/soc/codecs/cs4271.c | 4 ++--
sound/soc/codecs/madera.c | 2 +-
sound/soc/codecs/max98090.c | 6 +++---
sound/soc/codecs/tlv320aic23.c | 2 +-
sound/soc/codecs/tlv320dac33.c | 2 +-
sound/soc/codecs/uda1380.c | 2 +-
sound/soc/codecs/wl1273.c | 2 +-
sound/soc/codecs/wm8711.c | 2 +-
sound/soc/codecs/wm8753.c | 4 ++--
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index 7cea398ec392..c4b9722c3d8f 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -725,7 +725,7 @@ static int adav80x_dai_startup(struct snd_pcm_substream *substream,
struct snd_soc_component *component = dai->component;
struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
- if (!snd_soc_component_is_active(component) || !adav80x->rate)
+ if (!snd_soc_component_active(component) || !adav80x->rate)
return 0;
return snd_pcm_hw_constraint_single(substream->runtime,
@@ -738,7 +738,7 @@ static void adav80x_dai_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_component *component = dai->component;
struct adav80x *adav80x = snd_soc_component_get_drvdata(component);
- if (!snd_soc_component_is_active(component))
+ if (!snd_soc_component_active(component))
adav80x->rate = 0;
}
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 70341b30f567..9716c9624a89 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -1926,7 +1926,7 @@ static int arizona_dai_set_sysclk(struct snd_soc_dai *dai,
if (clk_id == dai_priv->clk)
return 0;
- if (dai->active) {
+ if (snd_soc_dai_active(dai)) {
dev_err(component->dev, "Can't change clock on active DAI %d\n",
dai->id);
return -EBUSY;
diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c
index 62f412d6f9f2..d43762ae8f3d 100644
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
@@ -356,9 +356,9 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
*/
if ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
- !dai->stream_active[SNDRV_PCM_STREAM_CAPTURE]) ||
+ !snd_soc_dai_stream_active(dai, SNDRV_PCM_STREAM_CAPTURE)) ||
(substream->stream == SNDRV_PCM_STREAM_CAPTURE &&
- !dai->stream_active[SNDRV_PCM_STREAM_PLAYBACK])) {
+ !snd_soc_dai_stream_active(dai, SNDRV_PCM_STREAM_PLAYBACK))) {
ret = regmap_update_bits(cs4271->regmap, CS4271_MODE2,
CS4271_MODE2_PDN,
CS4271_MODE2_PDN);
diff --git a/sound/soc/codecs/madera.c b/sound/soc/codecs/madera.c
index a448d2a2918a..ec380b0b2d4e 100644
--- a/sound/soc/codecs/madera.c
+++ b/sound/soc/codecs/madera.c
@@ -3279,7 +3279,7 @@ static int madera_dai_set_sysclk(struct snd_soc_dai *dai,
if (is_sync == madera_is_syncclk(dai_priv->clk))
return 0;
- if (dai->active) {
+ if (snd_soc_dai_active(dai)) {
dev_err(component->dev, "Can't change clock on active DAI %d\n",
dai->id);
return -EBUSY;
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 032adc14562d..e2cc1ad8cb0a 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2039,7 +2039,7 @@ static int max98090_dai_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- if (!max98090->master && dai->active == 1)
+ if (!max98090->master && snd_soc_dai_active(dai) == 1)
queue_delayed_work(system_power_efficient_wq,
&max98090->pll_det_enable_work,
msecs_to_jiffies(10));
@@ -2047,7 +2047,7 @@ static int max98090_dai_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- if (!max98090->master && dai->active == 1)
+ if (!max98090->master && snd_soc_dai_active(dai) == 1)
schedule_work(&max98090->pll_det_disable_work);
break;
default:
@@ -2109,7 +2109,7 @@ static void max98090_pll_work(struct max98090_priv *max98090)
unsigned int pll;
int i;
- if (!snd_soc_component_is_active(component))
+ if (!snd_soc_component_active(component))
return;
dev_info_ratelimited(component->dev, "PLL unlocked\n");
diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index f8e2f4b74db3..9868fb22323c 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -394,7 +394,7 @@ static void tlv320aic23_shutdown(struct snd_pcm_substream *substream,
struct aic23 *aic23 = snd_soc_component_get_drvdata(component);
/* deactivate */
- if (!snd_soc_component_is_active(component)) {
+ if (!snd_soc_component_active(component)) {
udelay(50);
snd_soc_component_write(component, TLV320AIC23_ACTIVE, 0x0);
}
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 808654b10deb..d905e03aaec7 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -449,7 +449,7 @@ static int dac33_set_fifo_mode(struct snd_kcontrol *kcontrol,
if (dac33->fifo_mode == ucontrol->value.enumerated.item[0])
return 0;
/* Do not allow changes while stream is running*/
- if (snd_soc_component_is_active(component))
+ if (snd_soc_component_active(component))
return -EPERM;
if (ucontrol->value.enumerated.item[0] >= DAC33_FIFO_LAST_MODE)
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c
index 26b2ee428aee..89f2bfeeb70e 100644
--- a/sound/soc/codecs/uda1380.c
+++ b/sound/soc/codecs/uda1380.c
@@ -110,7 +110,7 @@ static int uda1380_write(struct snd_soc_component *component, unsigned int reg,
/* the interpolator & decimator regs must only be written when the
* codec DAI is active.
*/
- if (!snd_soc_component_is_active(component) && (reg >= UDA1380_MVOL))
+ if (!snd_soc_component_active(component) && (reg >= UDA1380_MVOL))
return 0;
pr_debug("uda1380: hw write %x val %x\n", reg, value);
if (i2c_master_send(uda1380->i2c, data, 3) == 3) {
diff --git a/sound/soc/codecs/wl1273.c b/sound/soc/codecs/wl1273.c
index b30bfcd6a125..c56b9329240f 100644
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
@@ -183,7 +183,7 @@ static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
return 0;
/* Do not allow changes while stream is running */
- if (snd_soc_component_is_active(component))
+ if (snd_soc_component_active(component))
return -EPERM;
if (ucontrol->value.enumerated.item[0] >= ARRAY_SIZE(wl1273_audio_route))
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 8036b18fdeb9..5ad905dd78b7 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -198,7 +198,7 @@ static void wm8711_shutdown(struct snd_pcm_substream *substream,
struct snd_soc_component *component = dai->component;
/* deactivate */
- if (!snd_soc_component_is_active(component)) {
+ if (!snd_soc_component_active(component)) {
udelay(50);
snd_soc_component_write(component, WM8711_ACTIVE, 0x0);
}
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 95a12718f3af..8753c55c73fa 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -241,7 +241,7 @@ static int wm8753_set_dai(struct snd_kcontrol *kcontrol,
if (wm8753->dai_func == ucontrol->value.enumerated.item[0])
return 0;
- if (snd_soc_component_is_active(component))
+ if (snd_soc_component_active(component))
return -EBUSY;
ioctl = snd_soc_component_read32(component, WM8753_IOCTL);
@@ -1304,7 +1304,7 @@ static int wm8753_mute(struct snd_soc_dai *dai, int mute)
/* the digital mute covers the HiFi and Voice DAC's on the WM8753.
* make sure we check if they are not both active when we mute */
if (mute && wm8753->dai_func == 1) {
- if (!snd_soc_component_is_active(component))
+ if (!snd_soc_component_active(component))
snd_soc_component_write(component, WM8753_DAC, mute_reg | 0x8);
} else {
if (mute)
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 12/21] ASoC: fsl: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (10 preceding siblings ...)
2020-05-14 8:41 ` [PATCH v2 11/21] ASoC: codecs: " Kuninori Morimoto
@ 2020-05-14 8:42 ` Kuninori Morimoto
2020-05-14 8:42 ` [PATCH v2 13/21] ASoC: intel: " Kuninori Morimoto
` (9 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/fsl/fsl_esai.c | 2 +-
sound/soc/fsl/fsl_spdif.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 84290be778f0..edcf4036697c 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -488,7 +488,7 @@ static int fsl_esai_startup(struct snd_pcm_substream *substream,
{
struct fsl_esai *esai_priv = snd_soc_dai_get_drvdata(dai);
- if (!dai->active) {
+ if (!snd_soc_dai_active(dai)) {
/* Set synchronous mode */
regmap_update_bits(esai_priv->regmap, REG_ESAI_SAICR,
ESAI_SAICR_SYNC, esai_priv->synchronous ?
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index c711d2d93280..1b2e516f9162 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -466,7 +466,7 @@ static int fsl_spdif_startup(struct snd_pcm_substream *substream,
int ret;
/* Reset module and interrupts only for first initialization */
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_active(cpu_dai)) {
ret = clk_prepare_enable(spdif_priv->coreclk);
if (ret) {
dev_err(&pdev->dev, "failed to enable core clock\n");
@@ -554,7 +554,7 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream,
regmap_update_bits(regmap, REG_SPDIF_SCR, mask, scr);
/* Power down SPDIF module only if tx&rx are both inactive */
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_active(cpu_dai)) {
spdif_intr_status_clear(spdif_priv);
regmap_update_bits(regmap, REG_SPDIF_SCR,
SCR_LOW_POWER, SCR_LOW_POWER);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 13/21] ASoC: intel: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (11 preceding siblings ...)
2020-05-14 8:42 ` [PATCH v2 12/21] ASoC: fsl: " Kuninori Morimoto
@ 2020-05-14 8:42 ` Kuninori Morimoto
2020-05-14 8:42 ` [PATCH v2 14/21] ASoC: jz4740: " Kuninori Morimoto
` (8 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/intel/atom/sst-mfld-platform-pcm.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
index 2e9222ed9daa..8817eaae6bb7 100644
--- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
+++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
@@ -392,7 +392,7 @@ static int sst_enable_ssp(struct snd_pcm_substream *substream,
{
int ret = 0;
- if (!dai->active) {
+ if (!snd_soc_dai_active(dai)) {
ret = sst_handle_vb_timer(dai, true);
sst_fill_ssp_defaults(dai);
}
@@ -405,7 +405,7 @@ static int sst_be_hw_params(struct snd_pcm_substream *substream,
{
int ret = 0;
- if (dai->active == 1)
+ if (snd_soc_dai_active(dai) == 1)
ret = send_ssp_cmd(dai, dai->name, 1);
return ret;
}
@@ -414,7 +414,7 @@ static int sst_set_format(struct snd_soc_dai *dai, unsigned int fmt)
{
int ret = 0;
- if (!dai->active)
+ if (!snd_soc_dai_active(dai))
return 0;
ret = sst_fill_ssp_config(dai, fmt);
@@ -429,7 +429,7 @@ static int sst_platform_set_ssp_slot(struct snd_soc_dai *dai,
int slots, int slot_width) {
int ret = 0;
- if (!dai->active)
+ if (!snd_soc_dai_active(dai))
return ret;
ret = sst_fill_ssp_slot(dai, tx_mask, rx_mask, slots, slot_width);
@@ -442,7 +442,7 @@ static int sst_platform_set_ssp_slot(struct snd_soc_dai *dai,
static void sst_disable_ssp(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- if (!dai->active) {
+ if (!snd_soc_dai_active(dai)) {
send_ssp_cmd(dai, dai->name, 0);
sst_handle_vb_timer(dai, false);
}
@@ -743,7 +743,7 @@ static int sst_soc_prepare(struct device *dev)
for_each_card_rtds(drv->soc_card, rtd) {
struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0);
- if (dai->active) {
+ if (snd_soc_dai_active(dai)) {
send_ssp_cmd(dai, dai->name, 0);
sst_handle_vb_timer(dai, false);
}
@@ -764,7 +764,7 @@ static void sst_soc_complete(struct device *dev)
for_each_card_rtds(drv->soc_card, rtd) {
struct snd_soc_dai *dai = asoc_rtd_to_cpu(rtd, 0);
- if (dai->active) {
+ if (snd_soc_dai_active(dai)) {
sst_handle_vb_timer(dai, true);
send_ssp_cmd(dai, dai->name, 1);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 14/21] ASoC: jz4740: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (12 preceding siblings ...)
2020-05-14 8:42 ` [PATCH v2 13/21] ASoC: intel: " Kuninori Morimoto
@ 2020-05-14 8:42 ` Kuninori Morimoto
2020-05-14 8:42 ` [PATCH v2 15/21] ASoC: mediatek: " Kuninori Morimoto
` (7 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/jz4740/jz4740-i2s.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
index 6f6f8dad0356..403630b121f6 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -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);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 15/21] ASoC: mediatek: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (13 preceding siblings ...)
2020-05-14 8:42 ` [PATCH v2 14/21] ASoC: jz4740: " Kuninori Morimoto
@ 2020-05-14 8:42 ` Kuninori Morimoto
2020-05-14 8:42 ` [PATCH v2 16/21] ASoC: meson: " Kuninori Morimoto
` (6 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
index 6262e2c69107..75b46ae8b9fa 100644
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -297,7 +297,7 @@ static int mt8173_afe_i2s_startup(struct snd_pcm_substream *substream,
{
struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
- if (dai->active)
+ if (snd_soc_dai_active(dai))
return 0;
regmap_update_bits(afe->regmap, AUDIO_TOP_CON0,
@@ -310,7 +310,7 @@ static void mt8173_afe_i2s_shutdown(struct snd_pcm_substream *substream,
{
struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
- if (dai->active)
+ if (snd_soc_dai_active(dai))
return;
mt8173_afe_set_i2s_enable(afe, false);
@@ -347,7 +347,7 @@ static int mt8173_afe_hdmi_startup(struct snd_pcm_substream *substream,
struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
struct mt8173_afe_private *afe_priv = afe->platform_priv;
- if (dai->active)
+ if (snd_soc_dai_active(dai))
return 0;
mt8173_afe_dais_enable_clks(afe, afe_priv->clocks[MT8173_CLK_I2S3_M],
@@ -361,7 +361,7 @@ static void mt8173_afe_hdmi_shutdown(struct snd_pcm_substream *substream,
struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);
struct mt8173_afe_private *afe_priv = afe->platform_priv;
- if (dai->active)
+ if (snd_soc_dai_active(dai))
return;
mt8173_afe_dais_disable_clks(afe, afe_priv->clocks[MT8173_CLK_I2S3_M],
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 16/21] ASoC: meson: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (14 preceding siblings ...)
2020-05-14 8:42 ` [PATCH v2 15/21] ASoC: mediatek: " Kuninori Morimoto
@ 2020-05-14 8:42 ` Kuninori Morimoto
2020-05-14 8:42 ` [PATCH v2 17/21] ASoC: pxa: " Kuninori Morimoto
` (5 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/meson/axg-tdm-interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index d51f3344be7c..6de27238e9df 100644
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -149,7 +149,7 @@ static int axg_tdm_iface_startup(struct snd_pcm_substream *substream,
}
/* Apply component wide rate symmetry */
- if (dai->component->active) {
+ if (snd_soc_component_active(dai->component)) {
ret = snd_pcm_hw_constraint_single(substream->runtime,
SNDRV_PCM_HW_PARAM_RATE,
iface->rate);
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 17/21] ASoC: pxa: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (15 preceding siblings ...)
2020-05-14 8:42 ` [PATCH v2 16/21] ASoC: meson: " Kuninori Morimoto
@ 2020-05-14 8:42 ` Kuninori Morimoto
2020-05-14 8:43 ` [PATCH v2 18/21] ASoC: ti: " Kuninori Morimoto
` (4 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:42 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/pxa/pxa-ssp.c | 8 ++++----
sound/soc/pxa/pxa2xx-i2s.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index e615acaa0199..6a72cc1665b7 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -94,7 +94,7 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
struct snd_dmaengine_dai_dma_data *dma;
int ret = 0;
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_active(cpu_dai)) {
clk_prepare_enable(ssp->clk);
pxa_ssp_disable(ssp);
}
@@ -119,7 +119,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
struct ssp_device *ssp = priv->ssp;
- if (!cpu_dai->active) {
+ if (!snd_soc_dai_active(cpu_dai)) {
pxa_ssp_disable(ssp);
clk_disable_unprepare(ssp->clk);
}
@@ -138,7 +138,7 @@ static int pxa_ssp_suspend(struct snd_soc_component *component)
struct ssp_priv *priv = snd_soc_component_get_drvdata(component);
struct ssp_device *ssp = priv->ssp;
- if (!component->active)
+ if (!snd_soc_component_active(component))
clk_prepare_enable(ssp->clk);
priv->cr0 = __raw_readl(ssp->mmio_base + SSCR0);
@@ -165,7 +165,7 @@ static int pxa_ssp_resume(struct snd_soc_component *component)
__raw_writel(priv->to, ssp->mmio_base + SSTO);
__raw_writel(priv->psp, ssp->mmio_base + SSPSP);
- if (component->active)
+ if (snd_soc_component_active(component))
pxa_ssp_enable(ssp);
else
clk_disable_unprepare(ssp->clk);
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 9a32bf72127a..03102e938ba1 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -101,7 +101,7 @@ static int pxa2xx_i2s_startup(struct snd_pcm_substream *substream,
if (IS_ERR(clk_i2s))
return PTR_ERR(clk_i2s);
- if (!cpu_dai->active)
+ if (!snd_soc_dai_active(cpu_dai))
SACR0 = 0;
return 0;
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 18/21] ASoC: ti: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (16 preceding siblings ...)
2020-05-14 8:42 ` [PATCH v2 17/21] ASoC: pxa: " Kuninori Morimoto
@ 2020-05-14 8:43 ` Kuninori Morimoto
2020-05-14 9:08 ` Peter Ujfalusi
2020-05-14 8:43 ` [PATCH v2 19/21] ASoC: uniphier: " Kuninori Morimoto
` (3 subsequent siblings)
21 siblings, 1 reply; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:43 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/ti/davinci-mcasp.c | 2 +-
sound/soc/ti/omap-dmic.c | 4 ++--
sound/soc/ti/omap-mcbsp.c | 4 ++--
sound/soc/ti/omap-mcpdm.c | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 734ffe925c4d..f3a99f016557 100644
--- 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 913579c43e9d..01abf1be5d78 100644
--- 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 0348963f4df7..a9785d4916b7 100644
--- a/sound/soc/ti/omap-mcbsp.c
+++ b/sound/soc/ti/omap-mcbsp.c
@@ -788,7 +788,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);
/*
@@ -843,7 +843,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 f2dbadea33bb..d482b62f314a 100644
--- 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);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v2 18/21] ASoC: ti: use snd_soc_xxx_active()
2020-05-14 8:43 ` [PATCH v2 18/21] ASoC: ti: " Kuninori Morimoto
@ 2020-05-14 9:08 ` Peter Ujfalusi
0 siblings, 0 replies; 26+ messages in thread
From: Peter Ujfalusi @ 2020-05-14 9:08 UTC (permalink / raw)
To: Kuninori Morimoto, Mark Brown; +Cc: Linux-ALSA
[-- Attachment #1: Type: text/plain, Size: 4151 bytes --]
On 14/05/2020 11.43, Kuninori Morimoto wrote:
>
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> We have snd_soc_dai/dai_stream/component_active() macro
> This patch uses it.
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> v1 -> v2
> - adjust to latest patch-set
>
> sound/soc/ti/davinci-mcasp.c | 2 +-
> sound/soc/ti/omap-dmic.c | 4 ++--
> sound/soc/ti/omap-mcbsp.c | 4 ++--
> sound/soc/ti/omap-mcpdm.c | 8 ++++----
> 4 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
> index 734ffe925c4d..f3a99f016557 100644
> --- 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 913579c43e9d..01abf1be5d78 100644
> --- 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 0348963f4df7..a9785d4916b7 100644
> --- a/sound/soc/ti/omap-mcbsp.c
> +++ b/sound/soc/ti/omap-mcbsp.c
> @@ -788,7 +788,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);
>
> /*
> @@ -843,7 +843,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 f2dbadea33bb..d482b62f314a 100644
> --- 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);
> }
>
- Péter
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
[-- Attachment #2: pEpkey.asc --]
[-- Type: application/pgp-keys, Size: 1783 bytes --]
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v2 19/21] ASoC: uniphier: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (17 preceding siblings ...)
2020-05-14 8:43 ` [PATCH v2 18/21] ASoC: ti: " Kuninori Morimoto
@ 2020-05-14 8:43 ` Kuninori Morimoto
2020-05-14 8:43 ` [PATCH v2 20/21] ASoC: dwc: " Kuninori Morimoto
` (2 subsequent siblings)
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:43 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/uniphier/aio-cpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/uniphier/aio-cpu.c b/sound/soc/uniphier/aio-cpu.c
index fdaa6522720f..25c40c28eba4 100644
--- a/sound/soc/uniphier/aio-cpu.c
+++ b/sound/soc/uniphier/aio-cpu.c
@@ -424,7 +424,7 @@ static void uniphier_aio_dai_suspend(struct snd_soc_dai *dai)
{
struct uniphier_aio *aio = uniphier_priv(dai);
- if (!dai->active)
+ if (!snd_soc_dai_active(dai))
return;
aio->chip->num_wup_aios--;
@@ -448,7 +448,7 @@ static int uniphier_aio_dai_resume(struct snd_soc_dai *dai)
struct uniphier_aio *aio = uniphier_priv(dai);
int ret, i;
- if (!dai->active)
+ if (!snd_soc_dai_active(dai))
return 0;
if (!aio->chip->active)
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 20/21] ASoC: dwc: use snd_soc_xxx_active()
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (18 preceding siblings ...)
2020-05-14 8:43 ` [PATCH v2 19/21] ASoC: uniphier: " Kuninori Morimoto
@ 2020-05-14 8:43 ` Kuninori Morimoto
2020-05-14 8:43 ` [PATCH v2 21/21] ASoC: cleanup dai / component active code Kuninori Morimoto
2020-05-14 17:26 ` [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Ranjani Sridharan
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:43 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
We have snd_soc_dai/dai_stream/component_active() macro
This patch uses it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2
- adjust to latest patch-set
sound/soc/dwc/dwc-i2s.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index 515f88456dbd..fd4160289fac 100644
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -429,7 +429,7 @@ static int dw_i2s_resume(struct snd_soc_component *component)
for_each_component_dais(component, dai) {
for_each_pcm_streams(stream)
- if (dai->stream_active[stream])
+ if (snd_soc_dai_stream_active(dai, stream))
dw_i2s_config(dev, stream);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [PATCH v2 21/21] ASoC: cleanup dai / component active code
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (19 preceding siblings ...)
2020-05-14 8:43 ` [PATCH v2 20/21] ASoC: dwc: " Kuninori Morimoto
@ 2020-05-14 8:43 ` Kuninori Morimoto
2020-05-14 17:26 ` [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Ranjani Sridharan
21 siblings, 0 replies; 26+ messages in thread
From: Kuninori Morimoto @ 2020-05-14 8:43 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
v1 -> v2
- adjust to latest patch-set
include/sound/soc-component.h | 5 -----
include/sound/soc-dai.h | 2 --
sound/soc/soc-dai.c | 2 +-
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 820b9b618f97..9360936b7963 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -389,11 +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;
-}
#define snd_soc_component_active(component) ((component)->active)
/* component pin */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index d55dd0474096..e87b510f6f54 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -357,8 +357,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 8172ff42d796..ce4e1fd1ab79 100644
--- 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;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 26+ messages in thread
* Re: [PATCH v2 00/21] ASoC: cleanup DAI/Component activity
2020-05-14 8:36 [PATCH v2 00/21] ASoC: cleanup DAI/Component activity Kuninori Morimoto
` (20 preceding siblings ...)
2020-05-14 8:43 ` [PATCH v2 21/21] ASoC: cleanup dai / component active code Kuninori Morimoto
@ 2020-05-14 17:26 ` Ranjani Sridharan
21 siblings, 0 replies; 26+ messages in thread
From: Ranjani Sridharan @ 2020-05-14 17:26 UTC (permalink / raw)
To: Kuninori Morimoto, Mark Brown; +Cc: Linux-ALSA
On Thu, 2020-05-14 at 17:36 +0900, Kuninori Morimoto wrote:
> Hi Mark
>
> These are v2 of DAI/Component activity cleanup.
>
> This patch-set exchanges soc-dapm.c :: snd_soc_dai_link_event_xxx()
> behavior which updates dai->active but not cares other actives.
> But I think original code was wrong.
> So, I believe these works correctly, but maybe need some tests or
> deep review.
>
> v1 patch-set used "activity", but v2 is using "active" for each
> function/macro naming.
>
> Link:
> https://lore.kernel.org/r/875zd39frp.wl-kuninori.morimoto.gx@renesas.com
>
> Kuninori Morimoto (21):
> ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to
> macro
> ASoC: soc-dai: add snd_soc_dai_action()
> ASoC: soc-dapm: use snd_soc_dai_activate()/deactivate()
> ASoC: soc-dai: add snd_soc_dai_active()
> ASoC: soc-component: add snd_soc_component_active()
> ASoC: soc-dai: add snd_soc_dai_stream_active()
> ASoC: use snd_soc_xxx_active()
> ASoC: atomel: use snd_soc_xxx_active()
> ASoC: bcm: use snd_soc_xxx_active()
> ASoC: cirrus: use snd_soc_xxx_active()
> ASoC: codecs: use snd_soc_xxx_active()
> ASoC: fsl: use snd_soc_xxx_active()
> ASoC: intel: use snd_soc_xxx_active()
> ASoC: jz4740: use snd_soc_xxx_active()
> ASoC: mediatek: use snd_soc_xxx_active()
> ASoC: meson: use snd_soc_xxx_active()
> ASoC: pxa: use snd_soc_xxx_active()
> ASoC: ti: use snd_soc_xxx_active()
> ASoC: uniphier: use snd_soc_xxx_active()
> ASoC: dwc: use snd_soc_xxx_active()
> ASoC: cleanup dai / component active code
V2 looks good, Morimoto-san. Thanks!
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
^ permalink raw reply [flat|nested] 26+ messages in thread