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

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


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

sound/soc/samsung/i2s.c

+2 −3
Original line number Diff line number Diff line
@@ -1120,6 +1120,8 @@ static int samsung_i2s_dai_remove(struct snd_soc_dai *dai) 
}



static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {

	.probe = samsung_i2s_dai_probe,

	.remove = samsung_i2s_dai_remove,

	.trigger = i2s_trigger,

	.hw_params = i2s_hw_params,

	.set_fmt = i2s_set_fmt,
@@ -1188,9 +1190,6 @@ static int i2s_alloc_dais(struct samsung_i2s_priv *priv, 
	for (i = 0; i < num_dais; i++) {

		dai_drv = &priv->dai_drv[i];



		dai_drv->probe = samsung_i2s_dai_probe;

		dai_drv->remove = samsung_i2s_dai_remove;



		dai_drv->symmetric_rate = 1;

		dai_drv->ops = &samsung_i2s_dai_ops;

sound/soc/samsung/pcm.c

+9 −9
Original line number Diff line number Diff line
@@ -432,14 +432,6 @@ static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai, 
	return 0;

}



static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {

	.set_sysclk	= s3c_pcm_set_sysclk,

	.set_clkdiv	= s3c_pcm_set_clkdiv,

	.trigger	= s3c_pcm_trigger,

	.hw_params	= s3c_pcm_hw_params,

	.set_fmt	= s3c_pcm_set_fmt,

};



static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)

{

	struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(dai);
@@ -449,11 +441,19 @@ static int s3c_pcm_dai_probe(struct snd_soc_dai *dai) 
	return 0;

}



static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {

	.probe		= s3c_pcm_dai_probe,

	.set_sysclk	= s3c_pcm_set_sysclk,

	.set_clkdiv	= s3c_pcm_set_clkdiv,

	.trigger	= s3c_pcm_trigger,

	.hw_params	= s3c_pcm_hw_params,

	.set_fmt	= s3c_pcm_set_fmt,

};



#define S3C_PCM_RATES  SNDRV_PCM_RATE_8000_96000



#define S3C_PCM_DAI_DECLARE			\

	.symmetric_rate = 1,					\

	.probe = s3c_pcm_dai_probe,				\

	.ops = &s3c_pcm_dai_ops,				\

	.playback = {						\

		.channels_min	= 2,				\