Unverified Commit 878b5fee authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: codecs/cx2072x: 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/87fs4t9m4y.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/cx2072x.c

+9 −2
Original line number Diff line number Diff line
@@ -1546,6 +1546,14 @@ static int cx2072x_dsp_dai_probe(struct snd_soc_dai *dai) 
	return 0;

}



static const struct snd_soc_dai_ops cx2072x_dai_ops2 = {

	.probe		= cx2072x_dsp_dai_probe,

	.set_sysclk	= cx2072x_set_dai_sysclk,

	.set_fmt	= cx2072x_set_dai_fmt,

	.hw_params	= cx2072x_hw_params,

	.set_bclk_ratio	= cx2072x_set_dai_bclk_ratio,

};



#define CX2072X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE)



static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = {
@@ -1572,7 +1580,6 @@ static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = { 
	{ /* plabayck only, return echo reference to Conexant DSP chip */

		.name = "cx2072x-dsp",

		.id	= CX2072X_DAI_DSP,

		.probe = cx2072x_dsp_dai_probe,

		.playback = {

			.stream_name = "DSP Playback",

			.channels_min = 2,
@@ -1580,7 +1587,7 @@ static struct snd_soc_dai_driver soc_codec_cx2072x_dai[] = { 
			.rates = CX2072X_RATES_DSP,

			.formats = CX2072X_FORMATS,

		},

		.ops = &cx2072x_dai_ops,

		.ops = &cx2072x_dai_ops2,

	},

	{ /* plabayck only, return echo reference through I2S TX */

		.name = "cx2072x-aec",