diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 11:16:25 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-06 12:34:31 -0500 |
commit | 517b9a2a90676aeeefc7e2b8508fe4260e02c432 (patch) | |
tree | 9608885d664106c3c3d6ad4554667e883e9880c4 /sound/soc/samsung | |
parent | d27e51dade482acdf67021c12d692041a35bea77 (diff) |
ASoC: s3c24xx_uda134x: 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/samsung')
-rw-r--r-- | sound/soc/samsung/s3c24xx_uda134x.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index 9c6f7db56f60..50849e137fc0 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c | |||
@@ -173,16 +173,6 @@ static int s3c24xx_uda134x_hw_params(struct snd_pcm_substream *substream, | |||
173 | return -EINVAL; | 173 | return -EINVAL; |
174 | } | 174 | } |
175 | 175 | ||
176 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
177 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); | ||
178 | if (ret < 0) | ||
179 | return ret; | ||
180 | |||
181 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
182 | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS); | ||
183 | if (ret < 0) | ||
184 | return ret; | ||
185 | |||
186 | ret = snd_soc_dai_set_sysclk(cpu_dai, clk_source , clk, | 176 | ret = snd_soc_dai_set_sysclk(cpu_dai, clk_source , clk, |
187 | SND_SOC_CLOCK_IN); | 177 | SND_SOC_CLOCK_IN); |
188 | if (ret < 0) | 178 | if (ret < 0) |
@@ -223,6 +213,8 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { | |||
223 | .codec_name = "uda134x-codec", | 213 | .codec_name = "uda134x-codec", |
224 | .codec_dai_name = "uda134x-hifi", | 214 | .codec_dai_name = "uda134x-hifi", |
225 | .cpu_dai_name = "s3c24xx-iis", | 215 | .cpu_dai_name = "s3c24xx-iis", |
216 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | ||
217 | SND_SOC_DAIFMT_CBS_CFS, | ||
226 | .ops = &s3c24xx_uda134x_ops, | 218 | .ops = &s3c24xx_uda134x_ops, |
227 | .platform_name = "s3c24xx-iis", | 219 | .platform_name = "s3c24xx-iis", |
228 | }; | 220 | }; |