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

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

ASoC: neo1973_wm8753: 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 72303caf

sound/soc/samsung/neo1973_wm8753.c

+4 −21
Original line number Diff line number Diff line
@@ -70,20 +70,6 @@ static int neo1973_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_CBM_CFM);

	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_CBM_CFM);

	if (ret < 0)

		return ret;



	/* set the codec system clock for DAC and ADC */

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8753_MCLK, pll_out,

		SND_SOC_CLOCK_IN);
@@ -151,13 +137,6 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream, 


	pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */



	/* todo: gg check mode (DSP_B) against CSR datasheet */

	/* set codec DAI configuration */

	ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B |

		SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);

	if (ret < 0)

		return ret;



	/* set the codec system clock for DAC and ADC */

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8753_PCMCLK, 12288000,

		SND_SOC_CLOCK_IN);
@@ -300,6 +279,8 @@ static struct snd_soc_dai_link neo1973_dai[] = { 
	.cpu_dai_name = "s3c24xx-iis",

	.codec_dai_name = "wm8753-hifi",

	.codec_name = "wm8753.0-001a",

	.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBM_CFM,

	.init = neo1973_wm8753_init,

	.ops = &neo1973_hifi_ops,

},
@@ -309,6 +290,8 @@ static struct snd_soc_dai_link neo1973_dai[] = { 
	.cpu_dai_name = "bt-sco-pcm",

	.codec_dai_name = "wm8753-voice",

	.codec_name = "wm8753.0-001a",

	.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |

		   SND_SOC_DAIFMT_CBS_CFS,

	.ops = &neo1973_voice_ops,

},

};