Skip to content

Commit

Permalink
ASoC: OMAP machines: Remove soc_dapm_sync() call from init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Oct 10, 2011
1 parent 03b5362 commit cb42487
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 29 deletions.
2 changes: 0 additions & 2 deletions sound/soc/omap/am3517evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
1 change: 0 additions & 1 deletion sound/soc/omap/ams-delta.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 1 addition & 5 deletions sound/soc/omap/n810.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
8 changes: 2 additions & 6 deletions sound/soc/omap/omap3pandora.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 = {
Expand Down
2 changes: 0 additions & 2 deletions sound/soc/omap/osk5912.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 0 additions & 2 deletions sound/soc/omap/rx51.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 0 additions & 4 deletions sound/soc/omap/sdp3430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions sound/soc/omap/sdp4430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 1 addition & 3 deletions sound/soc/omap/zoom2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cb42487

Please sign in to comment.