diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 11:16:12 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-06 12:34:26 -0500 |
commit | 4de59dbd28565ad1074d2bcf294a0a4b41c64e07 (patch) | |
tree | 3c41dceff95c2dc634a8382029b969ab9dfaddeb | |
parent | b4508d0f95fa4aaed889549e31391641d675d4bb (diff) |
ASoC: eureka-tlv320: 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>
-rw-r--r-- | sound/soc/fsl/eukrea-tlv320.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index 9ce70fc67b09..8c9e9006dd84 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c | |||
@@ -42,25 +42,6 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream, | |||
42 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; | 42 | struct snd_soc_dai *cpu_dai = rtd->cpu_dai; |
43 | int ret; | 43 | int ret; |
44 | 44 | ||
45 | ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | | ||
46 | SND_SOC_DAIFMT_NB_NF | | ||
47 | SND_SOC_DAIFMT_CBM_CFM); | ||
48 | /* fsl_ssi lacks the set_fmt ops. */ | ||
49 | if (ret && ret != -ENOTSUPP) { | ||
50 | dev_err(cpu_dai->dev, | ||
51 | "Failed to set the cpu dai format.\n"); | ||
52 | return ret; | ||
53 | } | ||
54 | |||
55 | ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | | ||
56 | SND_SOC_DAIFMT_NB_NF | | ||
57 | SND_SOC_DAIFMT_CBM_CFM); | ||
58 | if (ret) { | ||
59 | dev_err(cpu_dai->dev, | ||
60 | "Failed to set the codec format.\n"); | ||
61 | return ret; | ||
62 | } | ||
63 | |||
64 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, | 45 | ret = snd_soc_dai_set_sysclk(codec_dai, 0, |
65 | CODEC_CLOCK, SND_SOC_CLOCK_OUT); | 46 | CODEC_CLOCK, SND_SOC_CLOCK_OUT); |
66 | if (ret) { | 47 | if (ret) { |
@@ -91,6 +72,8 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { | |||
91 | .name = "tlv320aic23", | 72 | .name = "tlv320aic23", |
92 | .stream_name = "TLV320AIC23", | 73 | .stream_name = "TLV320AIC23", |
93 | .codec_dai_name = "tlv320aic23-hifi", | 74 | .codec_dai_name = "tlv320aic23-hifi", |
75 | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | ||
76 | SND_SOC_DAIFMT_CBM_CFM, | ||
94 | .ops = &eukrea_tlv320_snd_ops, | 77 | .ops = &eukrea_tlv320_snd_ops, |
95 | }; | 78 | }; |
96 | 79 | ||