No driver is using dpcm_playback/capture, let's remove these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
include/sound/soc.h | 4 ----
sound/soc/soc-pcm.c | 12 ------------
2 files changed, 16 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 39613b406b1d..6030ad29d2d6 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -793,10 +793,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;
-
/* DPCM used FE & BE merged format */
unsigned int dpcm_merged_format:1;
/* DPCM used FE & BE merged channel */
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8761ae8fc05f..ac42c089815b 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2808,18 +2808,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
return -EINVAL;
}
- /* REMOVE ME */
- if (dai_link->dynamic || dai_link->no_pcm) {
- if (dai_link->dpcm_playback && !dai_link->dpcm_capture)
- dai_link->playback_only = 1;
- if (!dai_link->dpcm_playback && dai_link->dpcm_capture)
- dai_link->capture_only = 1;
- if (!dai_link->dpcm_playback && !dai_link->dpcm_capture) {
- dev_err(rtd->dev, "no dpcm_playback/capture are selected\n");
- return -EINVAL;
- }
- }
-
/* 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);
--
2.25.1
