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>
This commit is contained in:
Родитель
03b5362d2f
Коммит
cb4248779d
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 = {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче