dpcm_xxx flags are no longer needed. Let's remove it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
include/sound/soc.h | 5 -----
sound/soc/soc-pcm.c | 33 ---------------------------------
2 files changed, 38 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e6e359c1a2ac4..123a0140a23cf 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -815,11 +815,6 @@ struct snd_soc_dai_link {
/* This DAI link can route to other DAI links at runtime (Frontend)*/
unsigned int dynamic:1;
- /* REMOVE ME */
- /* 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 7a59121fc323c..27810f6f86302 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2860,39 +2860,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
has_capture = 1;
}
- /*
- * REMOVE ME
- *
- * dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used
- * as availability limitation
- */
- if (has_playback && has_capture) {
- if ( dai_link->dpcm_playback &&
- !dai_link->dpcm_capture &&
- !dai_link->playback_only) {
- dev_warn(rtd->card->dev,
- "both playback/capture are available,"
- " but not using playback_only flag (%s)\n",
- dai_link->stream_name);
- dev_warn(rtd->card->dev,
- "dpcm_playback/capture are no longer needed,"
- " please use playback/capture_only instead\n");
- has_capture = 0;
- }
-
- if (!dai_link->dpcm_playback &&
- dai_link->dpcm_capture &&
- !dai_link->capture_only) {
- dev_warn(rtd->card->dev,
- "both playback/capture are available,"
- " but not using capture_only flag (%s)\n",
- dai_link->stream_name);
- dev_warn(rtd->card->dev,
- "dpcm_playback/capture are no longer needed,"
- " please use playback/capture_only instead\n");
- has_playback = 0;
- }
- }
} else {
struct snd_soc_dai *codec_dai;
--
2.43.0
