Skip to content

Commit c7ae655

Browse files
morimotobroonie
authored andcommitted
ASoC: soc-pcm: remove dpcm_xxx flags
dpcm_xxx flags are no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/875xpm9vh3.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent ae0967d commit c7ae655

2 files changed

Lines changed: 0 additions & 38 deletions

File tree

include/sound/soc.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -820,11 +820,6 @@ struct snd_soc_dai_link {
820820
/* This DAI link can route to other DAI links at runtime (Frontend)*/
821821
unsigned int dynamic:1;
822822

823-
/* REMOVE ME */
824-
/* DPCM capture and Playback support */
825-
unsigned int dpcm_capture:1;
826-
unsigned int dpcm_playback:1;
827-
828823
/* DPCM used FE & BE merged format */
829824
unsigned int dpcm_merged_format:1;
830825
/* DPCM used FE & BE merged channel */

sound/soc/soc-pcm.c

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2844,39 +2844,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
28442844
has_capture = 1;
28452845
}
28462846

2847-
/*
2848-
* REMOVE ME
2849-
*
2850-
* dpcm_xxx flag will be removed soon, Indicates warning if dpcm_xxx flag was used
2851-
* as availability limitation
2852-
*/
2853-
if (has_playback && has_capture) {
2854-
if ( dai_link->dpcm_playback &&
2855-
!dai_link->dpcm_capture &&
2856-
!dai_link->playback_only) {
2857-
dev_warn(rtd->card->dev,
2858-
"both playback/capture are available,"
2859-
" but not using playback_only flag (%s)\n",
2860-
dai_link->stream_name);
2861-
dev_warn(rtd->card->dev,
2862-
"dpcm_playback/capture are no longer needed,"
2863-
" please use playback/capture_only instead\n");
2864-
has_capture = 0;
2865-
}
2866-
2867-
if (!dai_link->dpcm_playback &&
2868-
dai_link->dpcm_capture &&
2869-
!dai_link->capture_only) {
2870-
dev_warn(rtd->card->dev,
2871-
"both playback/capture are available,"
2872-
" but not using capture_only flag (%s)\n",
2873-
dai_link->stream_name);
2874-
dev_warn(rtd->card->dev,
2875-
"dpcm_playback/capture are no longer needed,"
2876-
" please use playback/capture_only instead\n");
2877-
has_playback = 0;
2878-
}
2879-
}
28802847
} else {
28812848
struct snd_soc_dai *codec_dai;
28822849

0 commit comments

Comments
 (0)