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

ASoC: codecs/cs47lxx: 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>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/87h6p99m55.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/codecs/cs47l15.c

+5 −1
Original line number Diff line number Diff line
@@ -1143,6 +1143,10 @@ static int cs47l15_set_fll(struct snd_soc_component *component, int fll_id, 
	}

}



static const struct snd_soc_dai_ops cs47l15_dai_ops = {

	.compress_new = snd_soc_new_compress,

};



static struct snd_soc_dai_driver cs47l15_dai[] = {

	{

		.name = "cs47l15-aif1",
@@ -1219,7 +1223,7 @@ static struct snd_soc_dai_driver cs47l15_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = snd_soc_new_compress,

		.ops = &cs47l15_dai_ops,

	},

	{

		.name = "cs47l15-dsp-trace",

sound/soc/codecs/cs47l24.c

+6 −2
Original line number Diff line number Diff line
@@ -957,6 +957,10 @@ static int cs47l24_set_fll(struct snd_soc_component *component, int fll_id, 
#define CS47L24_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\

			 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)



static const struct snd_soc_dai_ops cs47l24_dai_ops = {

	.compress_new = snd_soc_new_compress,

};



static struct snd_soc_dai_driver cs47l24_dai[] = {

	{

		.name = "cs47l24-aif1",
@@ -1033,7 +1037,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { 
			.rates = CS47L24_RATES,

			.formats = CS47L24_FORMATS,

		},

		.compress_new = snd_soc_new_compress,

		.ops = &cs47l24_dai_ops,

	},

	{

		.name = "cs47l24-dsp-voicectrl",
@@ -1054,7 +1058,7 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { 
			.rates = CS47L24_RATES,

			.formats = CS47L24_FORMATS,

		},

		.compress_new = snd_soc_new_compress,

		.ops = &cs47l24_dai_ops,

	},

	{

		.name = "cs47l24-dsp-trace",

sound/soc/codecs/cs47l35.c

+6 −2
Original line number Diff line number Diff line
@@ -1348,6 +1348,10 @@ static int cs47l35_set_fll(struct snd_soc_component *component, int fll_id, 
	}

}



static const struct snd_soc_dai_ops cs47l35_dai_ops = {

	.compress_new = snd_soc_new_compress,

};



static struct snd_soc_dai_driver cs47l35_dai[] = {

	{

		.name = "cs47l35-aif1",
@@ -1462,7 +1466,7 @@ static struct snd_soc_dai_driver cs47l35_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = &snd_soc_new_compress,

		.ops = &cs47l35_dai_ops,

	},

	{

		.name = "cs47l35-dsp-voicectrl",
@@ -1483,7 +1487,7 @@ static struct snd_soc_dai_driver cs47l35_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = &snd_soc_new_compress,

		.ops = &cs47l35_dai_ops,

	},

	{

		.name = "cs47l35-dsp-trace",

sound/soc/codecs/cs47l85.c

+6 −2
Original line number Diff line number Diff line
@@ -2249,6 +2249,10 @@ static int cs47l85_set_fll(struct snd_soc_component *component, int fll_id, 
	}

}



static const struct snd_soc_dai_ops cs47l85_dai_ops = {

	.compress_new = snd_soc_new_compress,

};



static struct snd_soc_dai_driver cs47l85_dai[] = {

	{

		.name = "cs47l85-aif1",
@@ -2404,7 +2408,7 @@ static struct snd_soc_dai_driver cs47l85_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = &snd_soc_new_compress,

		.ops = &cs47l85_dai_ops,

	},

	{

		.name = "cs47l85-dsp-voicectrl",
@@ -2425,7 +2429,7 @@ static struct snd_soc_dai_driver cs47l85_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = &snd_soc_new_compress,

		.ops = &cs47l85_dai_ops,

	},

	{

		.name = "cs47l85-dsp-trace",

sound/soc/codecs/cs47l90.c

+6 −2
Original line number Diff line number Diff line
@@ -2168,6 +2168,10 @@ static int cs47l90_set_fll(struct snd_soc_component *component, int fll_id, 
	}

}



static const struct snd_soc_dai_ops cs47l90_dai_ops = {

	.compress_new = snd_soc_new_compress,

};



static struct snd_soc_dai_driver cs47l90_dai[] = {

	{

		.name = "cs47l90-aif1",
@@ -2323,7 +2327,7 @@ static struct snd_soc_dai_driver cs47l90_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = &snd_soc_new_compress,

		.ops = &cs47l90_dai_ops,

	},

	{

		.name = "cs47l90-dsp-voicectrl",
@@ -2344,7 +2348,7 @@ static struct snd_soc_dai_driver cs47l90_dai[] = { 
			.rates = MADERA_RATES,

			.formats = MADERA_FORMATS,

		},

		.compress_new = &snd_soc_new_compress,

		.ops = &cs47l90_dai_ops,

	},

	{

		.name = "cs47l90-dsp-trace",