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

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

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

sound/soc/au1x/db1200.c

+3 −16
Original line number Diff line number Diff line
@@ -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,

};