hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: da732x: Merge da732x_dai1_ops and da732x_dai2_ops 

da732x_dai1_ops is identical to da732x_dai2_ops, so merge them to
da732x_dai_ops. The da732x_dai_ops is not modified after initialization,
so make it const.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Axel Lin 2015-07-15 09:51:33 +08:00 committed by Mark Brown
parent d770e558e2
commit a01da00cbc
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/da732x.c
View File

@ -1196,13 +1196,7 @@ static int da732x_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id,
#define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \ #define DA732X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
static struct snd_soc_dai_ops da732x_dai1_ops = { static const struct snd_soc_dai_ops da732x_dai_ops = {
.hw_params = da732x_hw_params,
.set_fmt = da732x_set_dai_fmt,
.set_sysclk = da732x_set_dai_sysclk,
};
static struct snd_soc_dai_ops da732x_dai2_ops = {
.hw_params = da732x_hw_params, .hw_params = da732x_hw_params,
.set_fmt = da732x_set_dai_fmt, .set_fmt = da732x_set_dai_fmt,
.set_sysclk = da732x_set_dai_sysclk, .set_sysclk = da732x_set_dai_sysclk,
@ -1227,7 +1221,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
.rates = DA732X_RATES, .rates = DA732X_RATES,
.formats = DA732X_FORMATS, .formats = DA732X_FORMATS,
}, },
.ops = &da732x_dai1_ops, .ops = &da732x_dai_ops,
}, },
{ {
.name = "DA732X_AIFB", .name = "DA732X_AIFB",
@ -1247,7 +1241,7 @@ static struct snd_soc_dai_driver da732x_dai[] = {
.rates = DA732X_RATES, .rates = DA732X_RATES,
.formats = DA732X_FORMATS, .formats = DA732X_FORMATS,
}, },
.ops = &da732x_dai2_ops, .ops = &da732x_dai_ops,
}, },
}; };