| Message ID | 87ednep4sz.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: replace dpcm_playback/capture to playback/capture_only | expand |
On 5/18/2023 7:49 AM, Kuninori Morimoto wrote: > soc_get_playback_capture() is now handling DPCM and normal comprehensively > for playback/capture stream. We can use playback/capture_only flag > instead of using dpcm_playback/capture. This patch replace these. > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > --- > sound/soc/soc-core.c | 20 +------------------- > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c > index b48efc3a08d2..f57911e4e4d5 100644 > --- a/sound/soc/soc-core.c > +++ b/sound/soc/soc-core.c > @@ -1781,25 +1781,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) > dai_link->platforms->name = component->name; > > /* convert non BE into BE */ > - if (!dai_link->no_pcm) { > - dai_link->no_pcm = 1; > - > - if (dai_link->dpcm_playback) > - dev_warn(card->dev, > - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n", > - dai_link->name); > - if (dai_link->dpcm_capture) > - dev_warn(card->dev, > - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=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; > - } > - } > + dai_link->no_pcm = 1; > > /* > * override any BE fixups Somehow feels bit weird, but logically it makes sense, so Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index b48efc3a08d2..f57911e4e4d5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1781,25 +1781,7 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) dai_link->platforms->name = component->name; /* convert non BE into BE */ - if (!dai_link->no_pcm) { - dai_link->no_pcm = 1; - - if (dai_link->dpcm_playback) - dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_playback=1\n", - dai_link->name); - if (dai_link->dpcm_capture) - dev_warn(card->dev, - "invalid configuration, dailink %s has flags no_pcm=0 and dpcm_capture=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; - } - } + dai_link->no_pcm = 1; /* * override any BE fixups
soc_get_playback_capture() is now handling DPCM and normal comprehensively for playback/capture stream. We can use playback/capture_only flag instead of using dpcm_playback/capture. This patch replace these. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- sound/soc/soc-core.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)