Unverified Commit 80585b0c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-topology: merge DAI call back functions into ops 



ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87il9p9m5a.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 586685f1

sound/soc/soc-topology.c

+5 −1
Original line number Diff line number Diff line
@@ -1560,6 +1560,10 @@ static void set_dai_flags(struct snd_soc_dai_driver *dai_drv, 
			1 : 0;

}



static const struct snd_soc_dai_ops tplg_dai_ops = {

	.compress_new	= snd_soc_new_compress,

};



static int soc_tplg_dai_create(struct soc_tplg *tplg,

	struct snd_soc_tplg_pcm *pcm)

{
@@ -1601,7 +1605,7 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg, 
	}



	if (pcm->compress)

		dai_drv->compress_new = snd_soc_new_compress;

		dai_drv->ops = &tplg_dai_ops;



	/* pass control to component driver for optional further init */

	ret = soc_tplg_dai_load(tplg, dai_drv, pcm, NULL);