Skip to content

Commit 44b6f24

Browse files
morimotobroonie
authored andcommitted
ASoC: soc-topology: remove dpcm_xxx flags
dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/878qui9vhe.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0f77c88 commit 44b6f24

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

sound/soc/soc-topology-test.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ static struct snd_soc_dai_link kunit_dai_links[] = {
8888
.nonatomic = 1,
8989
.dynamic = 1,
9090
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
91-
.dpcm_playback = 1,
92-
.dpcm_capture = 1,
9391
SND_SOC_DAILINK_REG(dummy, dummy, platform),
9492
},
9593
};

sound/soc/soc-topology.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,8 +1544,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
15441544
/* enable DPCM */
15451545
link->dynamic = 1;
15461546
link->ignore_pmdown_time = 1;
1547-
link->dpcm_playback = le32_to_cpu(pcm->playback);
1548-
link->dpcm_capture = le32_to_cpu(pcm->capture);
1547+
link->playback_only = le32_to_cpu(pcm->playback) && !le32_to_cpu(pcm->capture);
1548+
link->capture_only = !le32_to_cpu(pcm->playback) && le32_to_cpu(pcm->capture);
15491549
if (pcm->flag_mask)
15501550
set_link_flags(link,
15511551
le32_to_cpu(pcm->flag_mask),

0 commit comments

Comments
 (0)