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

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


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

sound/soc/meson/aiu-acodec-ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ static int aiu_acodec_ctrl_input_hw_params(struct snd_pcm_substream *substream, 
}



static const struct snd_soc_dai_ops aiu_acodec_ctrl_input_ops = {

	.probe		= meson_codec_glue_input_dai_probe,

	.remove		= meson_codec_glue_input_dai_remove,

	.hw_params	= aiu_acodec_ctrl_input_hw_params,

	.set_fmt	= meson_codec_glue_input_set_fmt,

};
@@ -130,8 +132,6 @@ static const struct snd_soc_dai_ops aiu_acodec_ctrl_output_ops = { 
	.name = "ACODEC CTRL " xname,				\

	.playback = AIU_ACODEC_STREAM(xname, "Playback", 8),	\

	.ops = &aiu_acodec_ctrl_input_ops,			\

	.probe = meson_codec_glue_input_dai_probe,		\

	.remove = meson_codec_glue_input_dai_remove,		\

}



#define AIU_ACODEC_OUTPUT(xname) {				\

sound/soc/meson/aiu-codec-ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static const struct snd_soc_dapm_widget aiu_hdmi_ctrl_widgets[] = { 
};



static const struct snd_soc_dai_ops aiu_codec_ctrl_input_ops = {

	.probe		= meson_codec_glue_input_dai_probe,

	.remove		= meson_codec_glue_input_dai_remove,

	.hw_params	= meson_codec_glue_input_hw_params,

	.set_fmt	= meson_codec_glue_input_set_fmt,

};
@@ -102,8 +104,6 @@ static const struct snd_soc_dai_ops aiu_codec_ctrl_output_ops = { 
	.name = "CODEC CTRL " xname,				\

	.playback = AIU_CODEC_CTRL_STREAM(xname, "Playback"),	\

	.ops = &aiu_codec_ctrl_input_ops,			\

	.probe = meson_codec_glue_input_dai_probe,		\

	.remove = meson_codec_glue_input_dai_remove,		\

}



#define AIU_CODEC_CTRL_OUTPUT(xname) {				\

sound/soc/meson/aiu-fifo-i2s.c

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ static int aiu_fifo_i2s_hw_params(struct snd_pcm_substream *substream, 
}



const struct snd_soc_dai_ops aiu_fifo_i2s_dai_ops = {

	.pcm_new	= aiu_fifo_pcm_new,

	.probe		= aiu_fifo_i2s_dai_probe,

	.remove		= aiu_fifo_dai_remove,

	.trigger	= aiu_fifo_i2s_trigger,

	.prepare	= aiu_fifo_i2s_prepare,

	.hw_params	= aiu_fifo_i2s_hw_params,

sound/soc/meson/aiu-fifo-spdif.c

+3 −0
Original line number Diff line number Diff line
@@ -155,6 +155,9 @@ static int fifo_spdif_hw_params(struct snd_pcm_substream *substream, 
}



const struct snd_soc_dai_ops aiu_fifo_spdif_dai_ops = {

	.pcm_new	= aiu_fifo_pcm_new,

	.probe		= aiu_fifo_spdif_dai_probe,

	.remove		= aiu_fifo_dai_remove,

	.trigger	= fifo_spdif_trigger,

	.prepare	= fifo_spdif_prepare,

	.hw_params	= fifo_spdif_hw_params,

sound/soc/meson/aiu.c

+0 −6
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ static struct snd_soc_dai_driver aiu_cpu_dai_drv[] = { 
			.formats	= AIU_FORMATS,

		},

		.ops		= &aiu_fifo_i2s_dai_ops,

		.pcm_new	= aiu_fifo_pcm_new,

		.probe		= aiu_fifo_i2s_dai_probe,

		.remove		= aiu_fifo_dai_remove,

	},

	[CPU_SPDIF_FIFO] = {

		.name = "SPDIF FIFO",
@@ -137,9 +134,6 @@ static struct snd_soc_dai_driver aiu_cpu_dai_drv[] = { 
			.formats	= AIU_FORMATS,

		},

		.ops		= &aiu_fifo_spdif_dai_ops,

		.pcm_new	= aiu_fifo_pcm_new,

		.probe		= aiu_fifo_spdif_dai_probe,

		.remove		= aiu_fifo_dai_remove,

	},

	[CPU_I2S_ENCODER] = {

		.name = "I2S Encoder",