[v2,5/5] ASoC: remove old trigger ordering method

Commit Message

Kuninori Morimoto June 8, 2023, 6:49 a.m. UTC

All drivers switch to use generic trigger ordering method.
Let's remove old method.

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 include/sound/soc-component.h |  2 --
 include/sound/soc.h           |  6 ------
 sound/soc/soc-pcm.c           | 10 ----------
 3 files changed, 18 deletions(-)

Patch

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index c7733382757b..87f248a06271 100644
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -199,8 +199,6 @@  struct snd_soc_component_driver {
 	bool use_dai_pcm_id;	/* use DAI link PCM ID as PCM device number */
 	int be_pcm_base;	/* base device ID for all BE PCMs */
 
-	unsigned int start_dma_last;
-
 #ifdef CONFIG_DEBUG_FS
 	const char *debugfs_prefix;
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 49442583d46d..52bb64d427f5 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -762,12 +762,6 @@  struct snd_soc_dai_link {
 	/* Do not create a PCM for this DAI link (Backend link) */
 	unsigned int ignore:1;
 
-	/* This flag will reorder stop sequence. By enabling this flag
-	 * DMA controller stop sequence will be invoked first followed by
-	 * CPU DAI driver stop sequence
-	 */
-	unsigned int stop_dma_first:1;
-
 #ifdef CONFIG_SND_SOC_TOPOLOGY
 	struct snd_soc_dobj dobj; /* For topology */
 #endif
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 40a75b3d0e9e..73860fe9b3a7 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1111,16 +1111,6 @@  static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 	    stop  < 0 || stop  >= SND_SOC_TRIGGER_ORDER_MAX)
 		return -EINVAL;
 
-	/* REMOVE ME */
-	for_each_rtd_components(rtd, i, component) {
-		if (component->driver->start_dma_last) {
-			start = SND_SOC_TRIGGER_ORDER_LDC;
-			break;
-		}
-	}
-	if (rtd->dai_link->stop_dma_first)
-		stop = SND_SOC_TRIGGER_ORDER_LDC;
-
 	/*
 	 * START
 	 */