ASoC: OMAP machines: Remove soc_dapm_sync() call from init

No need to call soc_dapm_sync at init time.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Anuj Aggarwal <anuj.aggarwal@ti.com>
Cc: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Cc: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Gražvydas Ignotas <notasas@gmail.com>
Cc: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index 48af0f87f84d9c8f34519e40fcfdb04e43d1ba7b..f5a4d65b2f60b81d6a829b47ad3ab705596d84f0 100644 (file)
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -107,8 +107,6 @@ static int am3517evm_aic23_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_enable_pin(dapm, "Line In");
        snd_soc_dapm_enable_pin(dapm, "Mic In");
 
-       snd_soc_dapm_sync(dapm);
-
        return 0;
 }
 

diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 0aa475f92efaac9f01ad36d7fc2d334acdc1d0df..dcb7b689a4eae468f47eea2a794dec5a0b2906cd 100644 (file)
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -569,7 +569,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_disable_pin(dapm, "Speaker");
        snd_soc_dapm_disable_pin(dapm, "AGCIN");
        snd_soc_dapm_disable_pin(dapm, "AGCOUT");
-       snd_soc_dapm_sync(dapm);
 
        /* Add virtual switch */
        ret = snd_soc_add_controls(codec, ams_delta_audio_controls,

diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index c10d3566ab1fa6a8743bd78873924658cf8197c3..4fa881bc00e58b2bc5fb5d8c5cfd6afd480675d0 100644 (file)
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -280,11 +280,7 @@ static int n810_aic33_init(struct snd_soc_pcm_runtime *rtd)
                                  ARRAY_SIZE(aic33_dapm_widgets));
 
        /* Set up N810 specific audio path audio_map */
-       snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-
-       snd_soc_dapm_sync(dapm);
-
-       return 0;
+       return snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */

diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 3ae87fd36612fdc2aefc0363538c830f0505a545..30a75b406aea653dd2666deaad373de2d5204d79 100644 (file)
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -173,10 +173,8 @@ static int omap3pandora_out_init(struct snd_soc_pcm_runtime *rtd)
        if (ret < 0)
                return ret;
 
-       snd_soc_dapm_add_routes(dapm, omap3pandora_out_map,
+       return snd_soc_dapm_add_routes(dapm, omap3pandora_out_map,
                ARRAY_SIZE(omap3pandora_out_map));
-
-       return snd_soc_dapm_sync(dapm);
 }
 
 static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)
@@ -196,10 +194,8 @@ static int omap3pandora_in_init(struct snd_soc_pcm_runtime *rtd)
        if (ret < 0)
                return ret;
 
-       snd_soc_dapm_add_routes(dapm, omap3pandora_in_map,
+       return snd_soc_dapm_add_routes(dapm, omap3pandora_in_map,
                ARRAY_SIZE(omap3pandora_in_map));
-
-       return snd_soc_dapm_sync(dapm);
 }
 
 static struct snd_soc_ops omap3pandora_ops = {

diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 597833246e3ad7d8a4cc14b2806638c2142ad167..18f8a2db2d31f4bf68faf71b2b43a3b5bac84698 100644 (file)
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -107,8 +107,6 @@ static int osk_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_enable_pin(dapm, "Line In");
        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
-       snd_soc_dapm_sync(dapm);
-
        return 0;
 }
 

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index 7164db5fc38a0c69f08424c5e023c291f3fcbae1..a56842380c724f619e755885c9a7c63a831394ca 100644 (file)
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/omap/rx51.c
@@ -317,8 +317,6 @@ static int rx51_aic34_init(struct snd_soc_pcm_runtime *rtd)
        if (err < 0)
                return err;
 
-       snd_soc_dapm_sync(dapm);
-
        /* AV jack detection */
        err = snd_soc_jack_new(codec, "AV Jack",
                               SND_JACK_HEADSET | SND_JACK_VIDEOOUT,

diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 269aded8a6becc38231abb3362086aa51a797bd2..85e2e9183e2116beaa758df3ce793a8320e34265 100644 (file)
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -159,10 +159,6 @@ static int sdp3430_twl4030_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_nc_pin(dapm, "CARKITL");
        snd_soc_dapm_nc_pin(dapm, "CARKITR");
 
-       ret = snd_soc_dapm_sync(dapm);
-       if (ret)
-               return ret;
-
        /* Headset jack detection */
        ret = snd_soc_jack_new(codec, "Headset Jack",
                                SND_JACK_HEADSET, &hs_jack);

diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 79ec76d521e1f6719780b0ec4eff636e529fb30f..98f05dc4c394e35143813af89fe7dd33988c09c2 100644 (file)
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -140,10 +140,6 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_enable_pin(dapm, "Headset Mic");
        snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
 
-       ret = snd_soc_dapm_sync(dapm);
-       if (ret)
-               return ret;
-
        /*
         * Configure McPDM offset cancellation based on the HSOTRIM value from
         * twl6040.

diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 8b1ebbce33aa36dc1a3f51282129cfecd1508b50..9a8288d5ea49939943905f23f2e85412eda0fe5e 100644 (file)
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -126,9 +126,7 @@ static int zoom2_twl4030_init(struct snd_soc_pcm_runtime *rtd)
        snd_soc_dapm_nc_pin(dapm, "CARKITL");
        snd_soc_dapm_nc_pin(dapm, "CARKITR");
 
-       ret = snd_soc_dapm_sync(dapm);
-
-       return ret;
+       return 0;
 }
 
 static int zoom2_twl4030_voice_init(struct snd_soc_pcm_runtime *rtd)