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

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


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

sound/soc/rockchip/rockchip_i2s.c

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



static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = {

	.probe = rockchip_i2s_dai_probe,

	.hw_params = rockchip_i2s_hw_params,

	.set_bclk_ratio	= rockchip_i2s_set_bclk_ratio,

	.set_sysclk = rockchip_i2s_set_sysclk,
@@ -547,7 +548,6 @@ static const struct snd_soc_dai_ops rockchip_i2s_dai_ops = { 
};



static struct snd_soc_dai_driver rockchip_i2s_dai = {

	.probe = rockchip_i2s_dai_probe,

	.ops = &rockchip_i2s_dai_ops,

	.symmetric_rate = 1,

};

sound/soc/rockchip/rockchip_i2s_tdm.c

+1 −1
Original line number Diff line number Diff line
@@ -1114,6 +1114,7 @@ static int rockchip_i2s_tdm_set_bclk_ratio(struct snd_soc_dai *dai, 
}



static const struct snd_soc_dai_ops rockchip_i2s_tdm_dai_ops = {

	.probe = rockchip_i2s_tdm_dai_probe,

	.hw_params = rockchip_i2s_tdm_hw_params,

	.set_bclk_ratio	= rockchip_i2s_tdm_set_bclk_ratio,

	.set_sysclk = rockchip_i2s_tdm_set_sysclk,
@@ -1324,7 +1325,6 @@ static const struct of_device_id rockchip_i2s_tdm_match[] = { 
};



static const struct snd_soc_dai_driver i2s_tdm_dai = {

	.probe = rockchip_i2s_tdm_dai_probe,

	.ops = &rockchip_i2s_tdm_dai_ops,

};

sound/soc/rockchip/rockchip_pdm.c

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



static const struct snd_soc_dai_ops rockchip_pdm_dai_ops = {

	.probe = rockchip_pdm_dai_probe,

	.set_fmt = rockchip_pdm_set_fmt,

	.trigger = rockchip_pdm_trigger,

	.hw_params = rockchip_pdm_hw_params,
@@ -391,7 +392,6 @@ static const struct snd_soc_dai_ops rockchip_pdm_dai_ops = { 
			      SNDRV_PCM_FMTBIT_S32_LE)



static struct snd_soc_dai_driver rockchip_pdm_dai = {

	.probe = rockchip_pdm_dai_probe,

	.capture = {

		.stream_name = "Capture",

		.channels_min = 2,

sound/soc/rockchip/rockchip_spdif.c

+1 −1
Original line number Diff line number Diff line
@@ -202,12 +202,12 @@ static int rk_spdif_dai_probe(struct snd_soc_dai *dai) 
}



static const struct snd_soc_dai_ops rk_spdif_dai_ops = {

	.probe = rk_spdif_dai_probe,

	.hw_params = rk_spdif_hw_params,

	.trigger = rk_spdif_trigger,

};



static struct snd_soc_dai_driver rk_spdif_dai = {

	.probe = rk_spdif_dai_probe,

	.playback = {

		.stream_name = "Playback",

		.channels_min = 2,