Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 87bea31c7b59a07fe5a1c827eb01db3b7c3ae672

Authored by Mark Brown
1 parent 4f4c007222
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 31 changed files with 0 additions and 73 deletions Side-by-side Diff

sound/soc/atmel/playpaq_wm8510.c
Diff comments   View file @ 87bea31
... ... @@ -338,7 +338,6 @@
338 338 /* always connected pins */
339 339 snd_soc_dapm_enable_pin(dapm, "Int Mic");
340 340 snd_soc_dapm_enable_pin(dapm, "Ext Spk");
341   - snd_soc_dapm_sync(dapm);
342 341  
343 342  
344 343  
sound/soc/atmel/sam9g20_wm8731.c
Diff comments   View file @ 87bea31
... ... @@ -173,8 +173,6 @@
173 173 /* always connected */
174 174 snd_soc_dapm_enable_pin(dapm, "Ext Spk");
175 175  
176   - snd_soc_dapm_sync(dapm);
177   -
178 176 return 0;
179 177 }
180 178  
sound/soc/atmel/snd-soc-afeb9260.c
Diff comments   View file @ 87bea31
... ... @@ -117,8 +117,6 @@
117 117 snd_soc_dapm_enable_pin(dapm, "Line In");
118 118 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
119 119  
120   - snd_soc_dapm_sync(dapm);
121   -
122 120 return 0;
123 121 }
124 122  
sound/soc/davinci/davinci-evm.c
Diff comments   View file @ 87bea31
... ... @@ -150,8 +150,6 @@
150 150 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
151 151 snd_soc_dapm_enable_pin(dapm, "Line In");
152 152  
153   - snd_soc_dapm_sync(dapm);
154   -
155 153 return 0;
156 154 }
157 155  
sound/soc/kirkwood/kirkwood-t5325.c
Diff comments   View file @ 87bea31
... ... @@ -79,8 +79,6 @@
79 79 snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
80 80 snd_soc_dapm_enable_pin(dapm, "Speaker");
81 81  
82   - snd_soc_dapm_sync(dapm);
83   -
84 82 return 0;
85 83 }
86 84  
sound/soc/mid-x86/mfld_machine.c
Diff comments   View file @ 87bea31
... ... @@ -233,7 +233,6 @@
233 233 /* always connected */
234 234 snd_soc_dapm_enable_pin(dapm, "Headphones");
235 235 snd_soc_dapm_enable_pin(dapm, "Mic");
236   - snd_soc_dapm_sync(dapm);
237 236  
238 237 ret_val = snd_soc_add_controls(codec, mfld_snd_controls,
239 238 ARRAY_SIZE(mfld_snd_controls));
... ... @@ -251,7 +250,6 @@
251 250 /* we dont use linein in this so set to NC */
252 251 snd_soc_dapm_disable_pin(dapm, "LINEINL");
253 252 snd_soc_dapm_disable_pin(dapm, "LINEINR");
254   - snd_soc_dapm_sync(dapm);
255 253  
256 254 /* Headset and button jack detection */
257 255 ret_val = snd_soc_jack_new(codec, "Intel(R) MID Audio Jack",
sound/soc/pxa/corgi.c
Diff comments   View file @ 87bea31
... ... @@ -299,7 +299,6 @@
299 299 /* Set up corgi specific audio path audio_map */
300 300 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
301 301  
302   - snd_soc_dapm_sync(dapm);
303 302 return 0;
304 303 }
305 304  
sound/soc/pxa/e740_wm9705.c
Diff comments   View file @ 87bea31
... ... @@ -108,8 +108,6 @@
108 108  
109 109 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
110 110  
111   - snd_soc_dapm_sync(dapm);
112   -
113 111 return 0;
114 112 }
115 113  
sound/soc/pxa/e750_wm9705.c
Diff comments   View file @ 87bea31
... ... @@ -90,8 +90,6 @@
90 90  
91 91 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
92 92  
93   - snd_soc_dapm_sync(dapm);
94   -
95 93 return 0;
96 94 }
97 95  
sound/soc/pxa/e800_wm9712.c
Diff comments   View file @ 87bea31
... ... @@ -80,7 +80,6 @@
80 80 ARRAY_SIZE(e800_dapm_widgets));
81 81  
82 82 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
83   - snd_soc_dapm_sync(dapm);
84 83  
85 84 return 0;
86 85 }
sound/soc/pxa/magician.c
Diff comments   View file @ 87bea31
... ... @@ -423,7 +423,6 @@
423 423 /* Set up magician specific audio path interconnects */
424 424 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
425 425  
426   - snd_soc_dapm_sync(dapm);
427 426 return 0;
428 427 }
429 428  
sound/soc/pxa/mioa701_wm9713.c
Diff comments   View file @ 87bea31
... ... @@ -151,7 +151,6 @@
151 151 snd_soc_dapm_enable_pin(dapm, "Front Mic");
152 152 snd_soc_dapm_enable_pin(dapm, "GSM Line In");
153 153 snd_soc_dapm_enable_pin(dapm, "GSM Line Out");
154   - snd_soc_dapm_sync(dapm);
155 154  
156 155 return 0;
157 156 }
sound/soc/pxa/palm27x.c
Diff comments   View file @ 87bea31
... ... @@ -107,10 +107,6 @@
107 107 snd_soc_dapm_nc_pin(dapm, "PHONE");
108 108 snd_soc_dapm_nc_pin(dapm, "MIC2");
109 109  
110   - err = snd_soc_dapm_sync(dapm);
111   - if (err)
112   - return err;
113   -
114 110 /* Jack detection API stuff */
115 111 err = snd_soc_jack_new(codec, "Headphone Jack",
116 112 SND_JACK_HEADPHONE, &hs_jack);
sound/soc/pxa/saarb.c
Diff comments   View file @ 87bea31
... ... @@ -146,10 +146,6 @@
146 146 snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
147 147 snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
148 148  
149   - ret = snd_soc_dapm_sync(dapm);
150   - if (ret)
151   - return ret;
152   -
153 149 /* Headset jack detection */
154 150 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
155 151 | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,
sound/soc/pxa/tavorevb3.c
Diff comments   View file @ 87bea31
... ... @@ -146,10 +146,6 @@
146 146 snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
147 147 snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
148 148  
149   - ret = snd_soc_dapm_sync(dapm);
150   - if (ret)
151   - return ret;
152   -
153 149 /* Headset jack detection */
154 150 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
155 151 | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,
sound/soc/pxa/tosa.c
Diff comments   View file @ 87bea31
... ... @@ -211,7 +211,6 @@
211 211 /* set up tosa specific audio path audio_map */
212 212 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
213 213  
214   - snd_soc_dapm_sync(dapm);
215 214 return 0;
216 215 }
217 216  
... ... @@ -161,10 +161,6 @@
161 161 /* Set up z2 specific audio paths */
162 162 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
163 163  
164   - ret = snd_soc_dapm_sync(dapm);
165   - if (ret)
166   - goto err;
167   -
168 164 /* Jack detection API stuff */
169 165 ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
170 166 &hs_jack);
sound/soc/pxa/zylonite.c
Diff comments   View file @ 87bea31
... ... @@ -87,7 +87,6 @@
87 87 snd_soc_dapm_enable_pin(dapm, "Headphone");
88 88 snd_soc_dapm_enable_pin(dapm, "Headset Earpiece");
89 89  
90   - snd_soc_dapm_sync(dapm);
91 90 return 0;
92 91 }
93 92  
sound/soc/samsung/goni_wm8994.c
Diff comments   View file @ 87bea31
... ... @@ -120,8 +120,6 @@
120 120 snd_soc_dapm_nc_pin(dapm, "SPKOUTRP");
121 121 }
122 122  
123   - snd_soc_dapm_sync(dapm);
124   -
125 123 /* Headset jack detection */
126 124 ret = snd_soc_jack_new(codec, "Headset Jack",
127 125 SND_JACK_HEADSET | SND_JACK_MECHANICAL | SND_JACK_AVOUT,
sound/soc/samsung/h1940_uda1380.c
Diff comments   View file @ 87bea31
... ... @@ -198,8 +198,6 @@
198 198 snd_soc_dapm_enable_pin(dapm, "Speaker");
199 199 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
200 200  
201   - snd_soc_dapm_sync(dapm);
202   -
203 201 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
204 202 &hp_jack);
205 203  
sound/soc/samsung/jive_wm8750.c
Diff comments   View file @ 87bea31
... ... @@ -120,7 +120,6 @@
120 120 }
121 121  
122 122 snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
123   - snd_soc_dapm_sync(dapm);
124 123  
125 124 return 0;
126 125 }
sound/soc/samsung/neo1973_wm8753.c
Diff comments   View file @ 87bea31
... ... @@ -367,8 +367,6 @@
367 367 return ret;
368 368 }
369 369  
370   - snd_soc_dapm_sync(dapm);
371   -
372 370 return 0;
373 371 }
374 372  
... ... @@ -408,8 +406,6 @@
408 406 snd_soc_dapm_ignore_suspend(dapm, "Stereo Out");
409 407 snd_soc_dapm_ignore_suspend(dapm, "Handset Spk");
410 408 snd_soc_dapm_ignore_suspend(dapm, "Headphone");
411   -
412   - snd_soc_dapm_sync(dapm);
413 409  
414 410 return 0;
415 411 }
sound/soc/samsung/rx1950_uda1380.c
Diff comments   View file @ 87bea31
... ... @@ -238,8 +238,6 @@
238 238 snd_soc_dapm_enable_pin(dapm, "Speaker");
239 239 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
240 240  
241   - snd_soc_dapm_sync(dapm);
242   -
243 241 snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
244 242 &hp_jack);
245 243  
sound/soc/samsung/s3c24xx_simtec_hermes.c
Diff comments   View file @ 87bea31
... ... @@ -76,7 +76,6 @@
76 76 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
77 77  
78 78 simtec_audio_init(rtd);
79   - snd_soc_dapm_sync(dapm);
80 79  
81 80 return 0;
82 81 }
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
Diff comments   View file @ 87bea31
... ... @@ -65,7 +65,6 @@
65 65 snd_soc_dapm_enable_pin(dapm, "Mic Jack");
66 66  
67 67 simtec_audio_init(rtd);
68   - snd_soc_dapm_sync(dapm);
69 68  
70 69 return 0;
71 70 }
sound/soc/samsung/smartq_wm8987.c
Diff comments   View file @ 87bea31
... ... @@ -178,10 +178,6 @@
178 178 snd_soc_dapm_enable_pin(dapm, "Internal Mic");
179 179 snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
180 180  
181   - err = snd_soc_dapm_sync(dapm);
182   - if (err)
183   - return err;
184   -
185 181 /* Headphone jack detection */
186 182 err = snd_soc_jack_new(codec, "Headphone Jack",
187 183 SND_JACK_HEADPHONE, &smartq_jack);
sound/soc/samsung/smdk_wm8580.c
Diff comments   View file @ 87bea31
... ... @@ -173,9 +173,6 @@
173 173 */
174 174 snd_soc_dapm_disable_pin(dapm, "MicIn");
175 175  
176   - /* signal a DAPM event */
177   - snd_soc_dapm_sync(dapm);
178   -
179 176 return 0;
180 177 }
181 178  
... ... @@ -190,9 +187,6 @@
190 187  
191 188 /* Set up PAIFRX audio path */
192 189 snd_soc_dapm_add_routes(dapm, audio_map_rx, ARRAY_SIZE(audio_map_rx));
193   -
194   - /* signal a DAPM event */
195   - snd_soc_dapm_sync(dapm);
196 190  
197 191 return 0;
198 192 }
sound/soc/samsung/smdk_wm8994.c
Diff comments   View file @ 87bea31
... ... @@ -117,8 +117,6 @@
117 117 snd_soc_dapm_nc_pin(dapm, "IN1RP");
118 118 snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
119 119  
120   - snd_soc_dapm_sync(dapm);
121   -
122 120 return 0;
123 121 }
124 122  
sound/soc/sh/sh7760-ac97.c
Diff comments   View file @ 87bea31
... ... @@ -20,12 +20,6 @@
20 20 extern struct snd_soc_dai_driver sh4_hac_dai[2];
21 21 extern struct snd_soc_platform_driver sh7760_soc_platform;
22 22  
23   -static int machine_init(struct snd_soc_pcm_runtime *rtd)
24   -{
25   - snd_soc_dapm_sync(&rtd->codec->dapm);
26   - return 0;
27   -}
28   -
29 23 static struct snd_soc_dai_link sh7760_ac97_dai = {
30 24 .name = "AC97",
31 25 .stream_name = "AC97 HiFi",
... ... @@ -33,7 +27,6 @@
33 27 .codec_dai_name = "ac97-hifi",
34 28 .platform_name = "sh7760-pcm-audio",
35 29 .codec_name = "ac97-codec",
36   - .init = machine_init,
37 30 .ops = NULL,
38 31 };
39 32  
sound/soc/tegra/tegra_wm8903.c
Diff comments   View file @ 87bea31
... ... @@ -339,8 +339,6 @@
339 339 snd_soc_dapm_nc_pin(dapm, "LINEOUTL");
340 340 }
341 341  
342   - snd_soc_dapm_sync(dapm);
343   -
344 342 return 0;
345 343 }
346 344  
sound/soc/tegra/trimslice.c
Diff comments   View file @ 87bea31
... ... @@ -124,8 +124,6 @@
124 124 snd_soc_dapm_nc_pin(dapm, "RHPOUT");
125 125 snd_soc_dapm_nc_pin(dapm, "MICIN");
126 126  
127   - snd_soc_dapm_sync(dapm);
128   -
129 127 return 0;
130 128 }
131 129