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: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index eff97c8e52184ac25ad1cea57a3a7b2f57327730..b3195bb24b72516b0c88652de65702d831ff8c22 100644 (file)
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -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;
 }
 

diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index 08acdc236bf8479259b33068716c21ac5aace275..9c128d4c8cbfc8cceec46f593e6392422b8994c5 100644 (file)
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -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;
 }
 

diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 25a7f8211ecf825bc0c3bd59cf9badcb82f6088a..de087ee3458ab0479628bd05b1ce50dca3ddb2be 100644 (file)
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -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 = {