Commit cb424877 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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



No need to call soc_dapm_sync at init time.

Signed-off-by: default avatarPeter 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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 03b5362d

sound/soc/omap/am3517evm.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

sound/soc/omap/ams-delta.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

sound/soc/omap/n810.c

+1 −5
Original line number Diff line number Diff line
@@ -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 */

sound/soc/omap/omap3pandora.c

+2 −6
Original line number Diff line number Diff line
@@ -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 = {

sound/soc/omap/osk5912.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE