[v3,22/23] ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only

Commit Message

Kuninori Morimoto April 18, 2024, 4:15 a.m. UTC

No driver is using dpcm_playback/capture and playback/capture_only flag,
let's remove these.

Signed-off-by: Kuninori Morimoto <[e-mail]>
---
 include/sound/soc.h  |  8 --------
 sound/soc/soc-core.c |  7 -------
 sound/soc/soc-pcm.c  | 18 ------------------
 3 files changed, 33 deletions(-)

Patch

diff --git a/include/sound/soc.h b/include/sound/soc.h
index e604d74f6e33..37602141834b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -787,10 +787,6 @@  struct snd_soc_dai_link {
 	/* Mark this pcm with non atomic ops */
 	unsigned int nonatomic:1;
 
-	/* For unidirectional dai links */
-	unsigned int playback_only:1;
-	unsigned int capture_only:1;
-
 	/* Keep DAI active over suspend */
 	unsigned int ignore_suspend:1;
 
@@ -805,10 +801,6 @@  struct snd_soc_dai_link {
 	/* This DAI link can route to other DAI links at runtime (Frontend)*/
 	unsigned int dynamic:1;
 
-	/* DPCM capture and Playback support */
-	unsigned int dpcm_capture:1;
-	unsigned int dpcm_playback:1;
-
 	/*
 	 * Capture / Playback support assertion. Having assertion flag is not mandatory.
 	 * In case of having assertion flag, non specific side will be disabled.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6667f34e875a..64270a4f75c6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2011,13 +2011,6 @@  static void soc_check_tplg_fes(struct snd_soc_card *card)
 					dev_warn(card->dev,
 						 "invalid configuration, dailink %s has flags no_pcm=0 and capture_assertion=1\n",
 						 dai_link->name);
-
-				/* convert normal link into DPCM one */
-				if (!(dai_link->playback_assertion ||
-				      dai_link->capture_assertion)) {
-					dai_link->playback_assertion = !dai_link->capture_only;
-					dai_link->capture_assertion = !dai_link->playback_only;
-				}
 			}
 
 			/*
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a79ca115f4e7..4ceca99e266f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2808,24 +2808,6 @@  static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
 		return -EINVAL;
 	}
 
-	/*
-	 * REMOVE ME
-	 *
-	 * dpcm_playback/capture will be used as playback/capture_assertion
-	 */
-	if (dai_link->playback_only && dai_link->capture_only) {
-		dev_err(rtd->dev, "both playback_only / capture_only are set\n");
-		return -EINVAL;
-	}
-	if (dai_link->playback_only)
-		dai_link->playback_assertion = 1;
-	if (dai_link->capture_only)
-		dai_link->capture_assertion = 1;
-	if (dai_link->dpcm_playback)
-		dai_link->playback_assertion = 1;
-	if (dai_link->dpcm_capture)
-		dai_link->capture_assertion = 1;
-
 	/* Adapt stream for codec2codec links */
 	cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK);
 	cpu_capture  = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE);