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

Commit 831ffa45 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: Remove needless snd_soc_dapm_sync() from machine driver inits 



ALSA SoC core takes care of calling snd_soc_dapm_sync() at the end
snd_soc_instantiate_card() so there is no need to call it from machine
driver init functions.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c9eaa447

sound/soc/intel/byt-rt5640.c

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) 
	snd_soc_dapm_enable_pin(dapm, "Speaker");

	snd_soc_dapm_enable_pin(dapm, "Internal Mic");



	snd_soc_dapm_sync(dapm);

	return ret;

}

sound/soc/pxa/brownstone.c

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ static int brownstone_wm8994_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");

	snd_soc_dapm_nc_pin(dapm, "IN2LN");



	snd_soc_dapm_sync(dapm);



	return 0;

}

sound/soc/tegra/tegra_wm9712.c

+1 −3
Original line number Diff line number Diff line
@@ -50,9 +50,7 @@ static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd) 
	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");



	return snd_soc_dapm_sync(dapm);

	return snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");

}



static struct snd_soc_dai_link tegra_wm9712_dai = {