diff options
| author | Lars-Peter Clausen | 2015-01-01 17:16:30 +0100 |
|---|---|---|
| committer | Mark Brown | 2015-01-06 18:34:32 +0100 |
| commit | 9cb2a25ce68aec15d5d940f5d3040bd66ca688c7 (patch) | |
| tree | 4fb8b3b327a0358436fb11a6de315ec33a85fc9f /sound/soc/sh/migor.c | |
| parent | ASoC: smdk_wm8994pcm: Use static DAI format setup (diff) | |
| download | kernel-qcow2-linux-9cb2a25ce68aec15d5d940f5d3040bd66ca688c7.tar.gz kernel-qcow2-linux-9cb2a25ce68aec15d5d940f5d3040bd66ca688c7.tar.xz kernel-qcow2-linux-9cb2a25ce68aec15d5d940f5d3040bd66ca688c7.zip | |
ASoC: migor: 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/sh/migor.c')
| -rw-r--r-- | sound/soc/sh/migor.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index c58c2529f103..82f582344fe7 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c @@ -63,16 +63,6 @@ static int migor_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; - ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_NB_IF | - SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_fmt(rtd->cpu_dai, SND_SOC_DAIFMT_NB_IF | - SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - codec_freq = rate * 512; /* * This propagates the parent frequency change to children and @@ -144,6 +134,8 @@ static struct snd_soc_dai_link migor_dai = { .codec_dai_name = "wm8978-hifi", .platform_name = "siu-pcm-audio", .codec_name = "wm8978.0-001a", + .dai_fmt = SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_CBS_CFS, .ops = &migor_dai_ops, }; |