Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 0a3f5e35aae43b20fef09fd800cf52cc9a2d61a8

Authored by Mark Brown
1 parent c871a05315
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

ASoC: Remove redundant snd_soc_dapm_new_widgets() calls 

The DAPM widgets are now insntantiated by the core when creating the card
so there is no need for the individual CODEC drivers to do so.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 35 changed files with 1 additions and 40 deletions Side-by-side Diff

sound/soc/codecs/ad1836.c
Diff comments   View file @ 0a3f5e3
... ... @@ -385,7 +385,6 @@
385 385 snd_soc_dapm_new_controls(codec, ad1836_dapm_widgets,
386 386 ARRAY_SIZE(ad1836_dapm_widgets));
387 387 snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
388   - snd_soc_dapm_new_widgets(codec);
389 388  
390 389 pcm_err:
391 390 return ret;
sound/soc/codecs/ad1938.c
Diff comments   View file @ 0a3f5e3
... ... @@ -592,7 +592,6 @@
592 592 snd_soc_dapm_new_controls(codec, ad1938_dapm_widgets,
593 593 ARRAY_SIZE(ad1938_dapm_widgets));
594 594 snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
595   - snd_soc_dapm_new_widgets(codec);
596 595  
597 596 ad1938_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
598 597  
sound/soc/codecs/ak4535.c
Diff comments   View file @ 0a3f5e3
... ... @@ -294,7 +294,6 @@
294 294  
295 295 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
296 296  
297   - snd_soc_dapm_new_widgets(codec);
298 297 return 0;
299 298 }
300 299  
sound/soc/codecs/ak4671.c
Diff comments   View file @ 0a3f5e3
... ... @@ -441,7 +441,6 @@
441 441  
442 442 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
443 443  
444   - snd_soc_dapm_new_widgets(codec);
445 444 return 0;
446 445 }
447 446  
sound/soc/codecs/cx20442.c
Diff comments   View file @ 0a3f5e3
... ... @@ -93,7 +93,6 @@
93 93 snd_soc_dapm_add_routes(codec, cx20442_audio_map,
94 94 ARRAY_SIZE(cx20442_audio_map));
95 95  
96   - snd_soc_dapm_new_widgets(codec);
97 96 return 0;
98 97 }
99 98  
sound/soc/codecs/ssm2602.c
Diff comments   View file @ 0a3f5e3
... ... @@ -210,7 +210,6 @@
210 210  
211 211 snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn));
212 212  
213   - snd_soc_dapm_new_widgets(codec);
214 213 return 0;
215 214 }
216 215  
sound/soc/codecs/tlv320aic23.c
Diff comments   View file @ 0a3f5e3
... ... @@ -395,7 +395,6 @@
395 395 /* set up audio path interconnects */
396 396 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
397 397  
398   - snd_soc_dapm_new_widgets(codec);
399 398 return 0;
400 399 }
401 400  
sound/soc/codecs/tlv320aic3x.c
Diff comments   View file @ 0a3f5e3
... ... @@ -753,7 +753,6 @@
753 753 /* set up audio path interconnects */
754 754 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
755 755  
756   - snd_soc_dapm_new_widgets(codec);
757 756 return 0;
758 757 }
759 758  
sound/soc/codecs/tlv320dac33.c
Diff comments   View file @ 0a3f5e3
... ... @@ -462,7 +462,6 @@
462 462  
463 463 /* set up audio path interconnects */
464 464 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
465   - snd_soc_dapm_new_widgets(codec);
466 465  
467 466 return 0;
468 467 }
sound/soc/codecs/twl4030.c
Diff comments   View file @ 0a3f5e3
... ... @@ -1493,7 +1493,6 @@
1493 1493  
1494 1494 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
1495 1495  
1496   - snd_soc_dapm_new_widgets(codec);
1497 1496 return 0;
1498 1497 }
1499 1498  
sound/soc/codecs/uda1380.c
Diff comments   View file @ 0a3f5e3
... ... @@ -378,7 +378,6 @@
378 378  
379 379 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
380 380  
381   - snd_soc_dapm_new_widgets(codec);
382 381 return 0;
383 382 }
384 383  
sound/soc/codecs/wm8350.c
Diff comments   View file @ 0a3f5e3
... ... @@ -800,7 +800,7 @@
800 800 return ret;
801 801 }
802 802  
803   - return snd_soc_dapm_new_widgets(codec);
  803 + return 0;
804 804 }
805 805  
806 806 static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai,
sound/soc/codecs/wm8400.c
Diff comments   View file @ 0a3f5e3
... ... @@ -915,7 +915,6 @@
915 915  
916 916 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
917 917  
918   - snd_soc_dapm_new_widgets(codec);
919 918 return 0;
920 919 }
921 920  
sound/soc/codecs/wm8510.c
Diff comments   View file @ 0a3f5e3
... ... @@ -219,7 +219,6 @@
219 219  
220 220 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
221 221  
222   - snd_soc_dapm_new_widgets(codec);
223 222 return 0;
224 223 }
225 224  
sound/soc/codecs/wm8523.c
Diff comments   View file @ 0a3f5e3
... ... @@ -117,7 +117,6 @@
117 117  
118 118 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
119 119  
120   - snd_soc_dapm_new_widgets(codec);
121 120 return 0;
122 121 }
123 122  
sound/soc/codecs/wm8580.c
Diff comments   View file @ 0a3f5e3
... ... @@ -315,7 +315,6 @@
315 315  
316 316 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
317 317  
318   - snd_soc_dapm_new_widgets(codec);
319 318 return 0;
320 319 }
321 320  
sound/soc/codecs/wm8711.c
Diff comments   View file @ 0a3f5e3
... ... @@ -99,7 +99,6 @@
99 99  
100 100 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
101 101  
102   - snd_soc_dapm_new_widgets(codec);
103 102 return 0;
104 103 }
105 104  
sound/soc/codecs/wm8728.c
Diff comments   View file @ 0a3f5e3
... ... @@ -74,8 +74,6 @@
74 74  
75 75 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
76 76  
77   - snd_soc_dapm_new_widgets(codec);
78   -
79 77 return 0;
80 78 }
81 79  
sound/soc/codecs/wm8731.c
Diff comments   View file @ 0a3f5e3
... ... @@ -159,7 +159,6 @@
159 159  
160 160 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
161 161  
162   - snd_soc_dapm_new_widgets(codec);
163 162 return 0;
164 163 }
165 164  
sound/soc/codecs/wm8750.c
Diff comments   View file @ 0a3f5e3
... ... @@ -403,7 +403,6 @@
403 403  
404 404 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
405 405  
406   - snd_soc_dapm_new_widgets(codec);
407 406 return 0;
408 407 }
409 408  
sound/soc/codecs/wm8753.c
Diff comments   View file @ 0a3f5e3
... ... @@ -673,7 +673,6 @@
673 673  
674 674 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
675 675  
676   - snd_soc_dapm_new_widgets(codec);
677 676 return 0;
678 677 }
679 678  
sound/soc/codecs/wm8900.c
Diff comments   View file @ 0a3f5e3
... ... @@ -618,8 +618,6 @@
618 618  
619 619 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
620 620  
621   - snd_soc_dapm_new_widgets(codec);
622   -
623 621 return 0;
624 622 }
625 623  
sound/soc/codecs/wm8903.c
Diff comments   View file @ 0a3f5e3
... ... @@ -919,8 +919,6 @@
919 919  
920 920 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
921 921  
922   - snd_soc_dapm_new_widgets(codec);
923   -
924 922 return 0;
925 923 }
926 924  
sound/soc/codecs/wm8940.c
Diff comments   View file @ 0a3f5e3
... ... @@ -298,7 +298,6 @@
298 298 ret = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
299 299 if (ret)
300 300 goto error_ret;
301   - ret = snd_soc_dapm_new_widgets(codec);
302 301  
303 302 error_ret:
304 303 return ret;
sound/soc/codecs/wm8960.c
Diff comments   View file @ 0a3f5e3
... ... @@ -307,7 +307,6 @@
307 307  
308 308 snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
309 309  
310   - snd_soc_dapm_new_widgets(codec);
311 310 return 0;
312 311 }
313 312  
sound/soc/codecs/wm8961.c
Diff comments   View file @ 0a3f5e3
... ... @@ -986,7 +986,6 @@
986 986 snd_soc_dapm_new_controls(codec, wm8961_dapm_widgets,
987 987 ARRAY_SIZE(wm8961_dapm_widgets));
988 988 snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
989   - snd_soc_dapm_new_widgets(codec);
990 989  
991 990 return ret;
992 991  
sound/soc/codecs/wm8971.c
Diff comments   View file @ 0a3f5e3
... ... @@ -338,8 +338,6 @@
338 338  
339 339 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
340 340  
341   - snd_soc_dapm_new_widgets(codec);
342   -
343 341 return 0;
344 342 }
345 343  
sound/soc/codecs/wm8974.c
Diff comments   View file @ 0a3f5e3
... ... @@ -276,7 +276,6 @@
276 276  
277 277 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
278 278  
279   - snd_soc_dapm_new_widgets(codec);
280 279 return 0;
281 280 }
282 281  
sound/soc/codecs/wm8988.c
Diff comments   View file @ 0a3f5e3
... ... @@ -790,7 +790,6 @@
790 790 snd_soc_dapm_new_controls(codec, wm8988_dapm_widgets,
791 791 ARRAY_SIZE(wm8988_dapm_widgets));
792 792 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
793   - snd_soc_dapm_new_widgets(codec);
794 793  
795 794 return ret;
796 795  
sound/soc/codecs/wm8990.c
Diff comments   View file @ 0a3f5e3
... ... @@ -920,7 +920,6 @@
920 920 /* set up the WM8990 audio map */
921 921 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
922 922  
923   - snd_soc_dapm_new_widgets(codec);
924 923 return 0;
925 924 }
926 925  
sound/soc/codecs/wm8993.c
Diff comments   View file @ 0a3f5e3
... ... @@ -1464,8 +1464,6 @@
1464 1464 wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff,
1465 1465 wm8993->pdata.lineout2_diff);
1466 1466  
1467   - snd_soc_dapm_new_widgets(codec);
1468   -
1469 1467 return ret;
1470 1468  
1471 1469 err:
sound/soc/codecs/wm9081.c
Diff comments   View file @ 0a3f5e3
... ... @@ -1262,7 +1262,6 @@
1262 1262 snd_soc_dapm_new_controls(codec, wm9081_dapm_widgets,
1263 1263 ARRAY_SIZE(wm9081_dapm_widgets));
1264 1264 snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
1265   - snd_soc_dapm_new_widgets(codec);
1266 1265  
1267 1266 return ret;
1268 1267  
sound/soc/codecs/wm9705.c
Diff comments   View file @ 0a3f5e3
... ... @@ -205,7 +205,6 @@
205 205 snd_soc_dapm_new_controls(codec, wm9705_dapm_widgets,
206 206 ARRAY_SIZE(wm9705_dapm_widgets));
207 207 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
208   - snd_soc_dapm_new_widgets(codec);
209 208  
210 209 return 0;
211 210 }
sound/soc/codecs/wm9712.c
Diff comments   View file @ 0a3f5e3
... ... @@ -436,7 +436,6 @@
436 436  
437 437 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
438 438  
439   - snd_soc_dapm_new_widgets(codec);
440 439 return 0;
441 440 }
442 441  
sound/soc/codecs/wm9713.c
Diff comments   View file @ 0a3f5e3
... ... @@ -625,7 +625,6 @@
625 625  
626 626 snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
627 627  
628   - snd_soc_dapm_new_widgets(codec);
629 628 return 0;
630 629 }
631 630