diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 11:16:13 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-06 12:34:27 -0500 |
commit | dea53bd36811d6b117a497eb91b2e4a54ef73548 (patch) | |
tree | e8ff478f1edd972ad84d2c95df3eda28a5910bea /sound/soc/fsl | |
parent | 4de59dbd28565ad1074d2bcf294a0a4b41c64e07 (diff) |
ASoC: mx27vis-aci32x4: Use static DAI format setup
Set the dai_fmt field in the dai_link struct instead of manually calling
snd_soc_dai_fmt(). This makes the code cleaner and shorter.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r-- | sound/soc/fsl/mx27vis-aic32x4.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/fsl/mx27vis-aic32x4.c b/sound/soc/fsl/mx27vis-aic32x4.c index b1ced7b8d80c..198eeb3f3f7a 100644 --- a/sound/soc/fsl/mx27vis-aic32x4.c +++ b/sound/soc/fsl/mx27vis-aic32x4.c | |||
@@ -55,16 +55,6 @@ static int mx27vis_aic32x4_hw_params(struct snd_pcm_substream *substream, | |||
55 | struct snd_soc_dai *codec_dai = rtd->codec_dai; | 55 | struct snd_soc_dai *codec_dai = rtd->codec_dai; |
56 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 56 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
57 | int ret; | 57 | int ret; |
58 | u32 dai_format; | ||
59 | |||
60 | dai_format = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | | ||
61 | SND_SOC_DAIFMT_CBM_CFM; | ||
62 | |||
63 | /* set codec DAI configuration */ | ||
64 | snd_soc_dai_set_fmt(codec_dai, dai_format); | ||
65 | |||
66 | /* set cpu DAI configuration */ | ||
67 | snd_soc_dai_set_fmt(cpu_dai, dai_format); | ||
68 | 58 | ||
69 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, | 59 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, |
70 | 25000000, SND_SOC_CLOCK_OUT); | 60 | 25000000, SND_SOC_CLOCK_OUT); |
@@ -164,6 +154,8 @@ static struct snd_soc_dai_link mx27vis_aic32x4_dai = { | |||
164 | .platform_name = "imx-ssi.0", | 154 | .platform_name = "imx-ssi.0", |
165 | .codec_name = "tlv320aic32x4.0-0018", | 155 | .codec_name = "tlv320aic32x4.0-0018", |
166 | .cpu_dai_name = "imx-ssi.0", | 156 | .cpu_dai_name = "imx-ssi.0", |
157 | .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | | ||
158 | SND_SOC_DAIFMT_CBM_CFM, | ||
167 | .ops = &mx27vis_aic32x4_snd_ops, | 159 | .ops = &mx27vis_aic32x4_snd_ops, |
168 | }; | 160 | }; |
169 | 161 | ||