ASoC: wm8940: remove unnecessary if statements
authorGreg Dietsche <Gregory.Dietsche@cuw.edu>
Mon, 6 Jun 2011 20:53:01 +0000 (15:53 -0500)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 7 Jun 2011 08:47:40 +0000 (09:47 +0100)
removing unnecessary if(ret) checks

This updated patch corrects a minor spelling problem in the commit message
and resolves two other (similar) issues found in wm8940.c by Jonathan Cameron.

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm8940.c

index 25580e3ee7c4d18f5941edce1ace022774b6e3c5..056daa0010f99238ce4edc1f34d0a6bfe959f655 100644 (file)
@@ -297,8 +297,6 @@ static int wm8940_add_widgets(struct snd_soc_codec *codec)
        if (ret)
                goto error_ret;
        ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
-       if (ret)
-               goto error_ret;
 
 error_ret:
        return ret;
@@ -683,8 +681,6 @@ static int wm8940_resume(struct snd_soc_codec *codec)
                }
        }
        ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-       if (ret)
-               goto error_ret;
 
 error_ret:
        return ret;
@@ -730,9 +726,6 @@ static int wm8940_probe(struct snd_soc_codec *codec)
        if (ret)
                return ret;
        ret = wm8940_add_widgets(codec);
-       if (ret)
-               return ret;
-
        return ret;
 }