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

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

ASoC: jive_wm8750: 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 5cc10b9b

sound/soc/samsung/jive_wm8750.c

+2 −14
Original line number Diff line number Diff line
@@ -61,20 +61,6 @@ static int jive_hw_params(struct snd_pcm_substream *substream, 
	s3c_i2sv2_iis_calc_rate(&div, NULL, params_rate(params),

				s3c_i2sv2_get_clock(cpu_dai));



	/* 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;



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

	ret = snd_soc_dai_set_sysclk(codec_dai, WM8750_SYSCLK, clk,

				     SND_SOC_CLOCK_IN);
@@ -121,6 +107,8 @@ static struct snd_soc_dai_link jive_dai = { 
	.platform_name	= "s3c2412-i2s",

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

	.init		= jive_wm8750_init,

	.dai_fmt	= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			  SND_SOC_DAIFMT_CBS_CFS,

	.ops		= &jive_ops,

};