diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-01 19:16:26 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-06 20:34:31 +0300 |
| commit | 10756c2770d7f4758e36d2a9e37ff2637001d610 (patch) | |
| tree | 898f31fb6cd395cbd00f90a471f336e76e9d2bd5 /sound/soc/samsung/smartq_wm8987.c | |
| parent | 517b9a2a90676aeeefc7e2b8508fe4260e02c432 (diff) | |
| download | linux-10756c2770d7f4758e36d2a9e37ff2637001d610.tar.xz | |
ASoC: smartq_wm8987: 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/smartq_wm8987.c')
| -rw-r--r-- | sound/soc/samsung/smartq_wm8987.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index 9b0ffacab790..8291d2a5f152 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c @@ -56,20 +56,6 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream, break; } - /* set codec DAI configuration */ - ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S | - SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - - /* set cpu DAI configuration */ - ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_I2S | - SND_SOC_DAIFMT_NB_NF | - SND_SOC_DAIFMT_CBS_CFS); - if (ret < 0) - return ret; - /* Use PCLK for I2S signal generation */ ret = snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_RCLKSRC_0, 0, SND_SOC_CLOCK_IN); @@ -199,6 +185,8 @@ static struct snd_soc_dai_link smartq_dai[] = { .platform_name = "samsung-i2s.0", .codec_name = "wm8750.0-0x1a", .init = smartq_wm8987_init, + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, .ops = &smartq_hifi_ops, }, }; |