kevin/linux
1
Fork 0
Code

ASoC: samsung: merge DAI call back functions into ops

Browse Source 
ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ttt99m6y.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2023-08-08 22:57:41 +00:00 committed by Mark Brown
parent d7dd3dec11
commit fda5c5e752
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/samsung/i2s.c
View File

@ -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 = { static const struct snd_soc_dai_ops samsung_i2s_dai_ops = {
.probe = samsung_i2s_dai_probe,
.remove = samsung_i2s_dai_remove,
.trigger = i2s_trigger, .trigger = i2s_trigger,
.hw_params = i2s_hw_params, .hw_params = i2s_hw_params,
.set_fmt = i2s_set_fmt, .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++) { for (i = 0; i < num_dais; i++) {
dai_drv = &priv->dai_drv[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->symmetric_rate = 1;
dai_drv->ops = &samsung_i2s_dai_ops; dai_drv->ops = &samsung_i2s_dai_ops;

18
sound/soc/samsung/pcm.c
View File

@ -432,14 +432,6 @@ static int s3c_pcm_set_sysclk(struct snd_soc_dai *cpu_dai,
return 0; 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) static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)
{ {
struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(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; 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_RATES SNDRV_PCM_RATE_8000_96000
#define S3C_PCM_DAI_DECLARE \ #define S3C_PCM_DAI_DECLARE \
.symmetric_rate = 1, \ .symmetric_rate = 1, \
.probe = s3c_pcm_dai_probe, \
.ops = &s3c_pcm_dai_ops, \ .ops = &s3c_pcm_dai_ops, \
.playback = { \ .playback = { \
.channels_min = 2, \ .channels_min = 2, \