Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fce20bf8 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: smdk_wm8994pcm: 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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6a5794f2

sound/soc/samsung/smdk_wm8994pcm.c

+2 −14
Original line number Original line Diff line number Diff line
@@ -68,20 +68,6 @@ static int smdk_wm8994_pcm_hw_params(struct snd_pcm_substream *substream, 




	mclk_freq = params_rate(params) * rfs;

	mclk_freq = params_rate(params) * rfs;





	/* Set the codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B

				| SND_SOC_DAIFMT_IB_NF

				| SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* Set the cpu DAI configuration */

	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B

				| SND_SOC_DAIFMT_IB_NF

				| SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	ret = snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_FLL1,

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8994_SYSCLK_FLL1,

					mclk_freq, SND_SOC_CLOCK_IN);

					mclk_freq, SND_SOC_CLOCK_IN);

	if (ret < 0)

	if (ret < 0)
@@ -118,6 +104,8 @@ static struct snd_soc_dai_link smdk_dai[] = { 
		.codec_dai_name = "wm8994-aif1",

		.codec_dai_name = "wm8994-aif1",

		.platform_name = "samsung-pcm.0",

		.platform_name = "samsung-pcm.0",

		.codec_name = "wm8994-codec",

		.codec_name = "wm8994-codec",

		.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

		.ops = &smdk_wm8994_pcm_ops,

		.ops = &smdk_wm8994_pcm_ops,

	},

	},

};

};