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

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


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

sound/soc/jz4740/jz4740-i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ static int jz4740_i2s_dai_probe(struct snd_soc_dai *dai) 
}



static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = {

	.probe = jz4740_i2s_dai_probe,

	.startup = jz4740_i2s_startup,

	.shutdown = jz4740_i2s_shutdown,

	.trigger = jz4740_i2s_trigger,
@@ -341,7 +342,6 @@ static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = { 
			 SNDRV_PCM_FMTBIT_S24_LE)



static struct snd_soc_dai_driver jz4740_i2s_dai = {

	.probe = jz4740_i2s_dai_probe,

	.playback = {

		.channels_min = 1,

		.channels_max = 2,
@@ -384,7 +384,6 @@ static const struct i2s_soc_info x1000_i2s_soc_info = { 
};



static struct snd_soc_dai_driver jz4770_i2s_dai = {

	.probe = jz4740_i2s_dai_probe,

	.playback = {

		.channels_min = 1,

		.channels_max = 2,