Commit 4cae37fa98f4d50778161ec033122444e3c10a01

Authored by Takashi Iwai
1 parent 330f28f691

ASoC: Remove dead code and labels

Remove the dead code and labels "card_err" in the error paths of
some codec drivers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 5 changed files with 0 additions and 25 deletions Side-by-side Diff

sound/soc/codecs/ad1836.c
... ... @@ -387,11 +387,6 @@
387 387 snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
388 388 snd_soc_dapm_new_widgets(codec);
389 389  
390   - return ret;
391   -
392   -card_err:
393   - snd_soc_free_pcms(socdev);
394   - snd_soc_dapm_free(socdev);
395 390 pcm_err:
396 391 return ret;
397 392 }
sound/soc/codecs/ad1938.c
... ... @@ -596,11 +596,6 @@
596 596  
597 597 ad1938_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
598 598  
599   - return ret;
600   -
601   -card_err:
602   - snd_soc_free_pcms(socdev);
603   - snd_soc_dapm_free(socdev);
604 599 pcm_err:
605 600 return ret;
606 601 }
sound/soc/codecs/cx20442.c
... ... @@ -355,11 +355,6 @@
355 355  
356 356 cx20442_add_widgets(codec);
357 357  
358   - return ret;
359   -
360   -card_err:
361   - snd_soc_free_pcms(socdev);
362   - snd_soc_dapm_free(socdev);
363 358 pcm_err:
364 359 return ret;
365 360 }
sound/soc/codecs/wm8400.c
... ... @@ -1400,11 +1400,6 @@
1400 1400 wm8400_add_controls(codec);
1401 1401 wm8400_add_widgets(codec);
1402 1402  
1403   - return ret;
1404   -
1405   -card_err:
1406   - snd_soc_free_pcms(socdev);
1407   - snd_soc_dapm_free(socdev);
1408 1403 pcm_err:
1409 1404 return ret;
1410 1405 }
sound/soc/codecs/wm8900.c
... ... @@ -1353,11 +1353,6 @@
1353 1353 ARRAY_SIZE(wm8900_snd_controls));
1354 1354 wm8900_add_widgets(codec);
1355 1355  
1356   - return ret;
1357   -
1358   -card_err:
1359   - snd_soc_free_pcms(socdev);
1360   - snd_soc_dapm_free(socdev);
1361 1356 pcm_err:
1362 1357 return ret;
1363 1358 }