Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: soc-pcm: remove dpcm_xxx flags

Browse Source 
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>
This commit is contained in:
Kuninori Morimoto 2024-10-20 23:59:36 +00:00 committed by Mark Brown
parent ae0967da4b
commit c7ae655153
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/sound/soc.h
View File

@ -820,11 +820,6 @@ struct snd_soc_dai_link {
/* This DAI link can route to other DAI links at runtime (Frontend)*/ /* This DAI link can route to other DAI links at runtime (Frontend)*/
unsigned int dynamic:1; 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 */ /* DPCM used FE & BE merged format */
unsigned int dpcm_merged_format:1; unsigned int dpcm_merged_format:1;
/* DPCM used FE & BE merged channel */ /* DPCM used FE & BE merged channel */

33
sound/soc/soc-pcm.c
View File

@ -2844,39 +2844,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
has_capture = 1; 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 { } else {
struct snd_soc_dai *codec_dai; struct snd_soc_dai *codec_dai;