summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/saarb.c
diff options
context:
space:
mode:
authorMark Brown2011-10-08 14:29:18 +0200
committerMark Brown2011-10-08 15:10:54 +0200
commit87bea31c7b59a07fe5a1c827eb01db3b7c3ae672 (patch)
tree79ad5ea9603bef2db55d50610a2d9e2ba3076409 /sound/soc/pxa/saarb.c
parentASoC: Suppress early calls to snd_soc_dapm_sync() (diff)
downloadkernel-qcow2-linux-87bea31c7b59a07fe5a1c827eb01db3b7c3ae672.tar.gz
kernel-qcow2-linux-87bea31c7b59a07fe5a1c827eb01db3b7c3ae672.tar.xz
kernel-qcow2-linux-87bea31c7b59a07fe5a1c827eb01db3b7c3ae672.zip
ASoC: Remove redundant snd_soc_dapm_sync() calls from machine drivers
The core will sync DAPM as part of the card initialization, there is no need for machine drivers to do so during their setup. OMAP drivers are omitted as I know Peter already has patches for them. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/pxa/saarb.c')
-rw-r--r--sound/soc/pxa/saarb.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c
index 9595189fc681..d9467a2c6de0 100644
--- a/sound/soc/pxa/saarb.c
+++ b/sound/soc/pxa/saarb.c
@@ -146,10 +146,6 @@ static int saarb_pm860x_init(struct snd_soc_pcm_runtime *rtd)
snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
- ret = snd_soc_dapm_sync(dapm);
- if (ret)
- return ret;
-
/* Headset jack detection */
snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
| SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,