soc_get_playback_capture() is now handling DPCM and normal
comprehensively for playback/capture stream in same code.
This patch converts dpcm_xxx flag to xxx_assertion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
sound/soc/soc-core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 3ab6626ad680..6667f34e875a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2003,20 +2003,20 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
if (!dai_link->no_pcm) {
dai_link->no_pcm = 1;
- if (dai_link->dpcm_playback)
+ if (dai_link->playback_assertion)
dev_warn(card->dev,
- "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n",
+ "invalid configuration, dailink %s has flags no_pcm=0 and playback_assertion=1\n",
dai_link->name);
- if (dai_link->dpcm_capture)
+ if (dai_link->capture_assertion)
dev_warn(card->dev,
- "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=1\n",
+ "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->dpcm_playback ||
- dai_link->dpcm_capture)) {
- dai_link->dpcm_playback = !dai_link->capture_only;
- dai_link->dpcm_capture = !dai_link->playback_only;
+ 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;
}
}
--
2.25.1
