diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 17:16:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 17:34:26 +0000 |
| commit | b4508d0f95fa4aaed889549e31391641d675d4bb (patch) | |
| tree | ca80ebe57035a5b78b50b7fcd28ae5d512849685 /sound/soc/au1x | |
| parent | 059d3dc6e5e8d4a62803eb3ad01b34fa3f714675 (diff) | |
| download | op-kernel-dev-b4508d0f95fa4aaed889549e31391641d675d4bb.zip op-kernel-dev-b4508d0f95fa4aaed889549e31391641d675d4bb.tar.gz | |
ASoC: db1200: 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/au1x')
| -rw-r--r-- | sound/soc/au1x/db1200.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c index a747ac0..c75995f 100644 --- a/sound/soc/au1x/db1200.c +++ b/sound/soc/au1x/db1200.c @@ -91,27 +91,12 @@ static int db1200_i2s_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int ret; /* WM8731 has its own 12MHz crystal */ snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL, 12000000, SND_SOC_CLOCK_IN); - /* codec is bitclock and lrclk master */ - ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_LEFT_J | - SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); - if (ret < 0) - goto out; - - ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_LEFT_J | - SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); - if (ret < 0) - goto out; - - ret = 0; -out: - return ret; + return 0; } static struct snd_soc_ops db1200_i2s_wm8731_ops = { @@ -125,6 +110,8 @@ static struct snd_soc_dai_link db1200_i2s_dai = { .cpu_dai_name = "au1xpsc_i2s.1", .platform_name = "au1xpsc-pcm.1", .codec_name = "wm8731.0-001b", + .dai_fmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, .ops = &db1200_i2s_wm8731_ops, }; |
