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>

diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c
index 2e360c2430759a476ba0b5e1e6b0848665742952..b4be96decf3243f45262bd5efbf7aa07a6e62eca 100644 (file)
--- a/sound/soc/codecs/ad1836.c
+++ b/sound/soc/codecs/ad1836.c
@@ -387,11 +387,6 @@ static int ad1836_probe(struct platform_device *pdev)
        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
        snd_soc_dapm_new_widgets(codec);
 
-       return ret;
-
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }

diff --git a/sound/soc/codecs/ad1938.c b/sound/soc/codecs/ad1938.c
index 09c008ad147603c02c0d70e0cdba1868bb0a78c4..3b2222a0c8080afb482692c68b31873ca9d6efd4 100644 (file)
--- a/sound/soc/codecs/ad1938.c
+++ b/sound/soc/codecs/ad1938.c
@@ -596,11 +596,6 @@ static int ad1938_probe(struct platform_device *pdev)
 
        ad1938_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-       return ret;
-
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index d7f9bf18b72eab6cac1702c99dcc04b8d8c7183f..dda751c885cb85dab4799ac8dba7141088789c1c 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -355,11 +355,6 @@ static int cx20442_codec_probe(struct platform_device *pdev)
 
        cx20442_add_widgets(codec);
 
-       return ret;
-
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }

diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c
index 0e30997c8db06d3e295413a486dfbeb597abfcbe..584af68af22aacebf706a54d11fcdca74cc44b04 100644 (file)
--- a/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@ -1400,11 +1400,6 @@ static int wm8400_probe(struct platform_device *pdev)
        wm8400_add_controls(codec);
        wm8400_add_widgets(codec);
 
-       return ret;
-
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 0d185cb6418d8ed21b53892b3674c50d73d5c5d7..85f67dbe211d7b058857cb429c332b313e4cf0c7 100644 (file)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -1353,11 +1353,6 @@ static int wm8900_probe(struct platform_device *pdev)
                                ARRAY_SIZE(wm8900_snd_controls));
        wm8900_add_widgets(codec);
 
-       return ret;
-
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
 pcm_err:
        return ret;
 }