diff options
author | Greg Dietsche <Gregory.Dietsche@cuw.edu> | 2011-06-06 16:53:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-07 04:47:40 -0400 |
commit | bca6b39979dfe0b2d14a3ca35e2930f5d9c8e3f5 (patch) | |
tree | 308e3f362430ec3a6c15e71cfbf99e9063b968fe /sound/soc | |
parent | 46758dee727348d3648c83445d10ded321376543 (diff) |
ASoC: wm8940: remove unnecessary if statements
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/codecs/wm8940.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 25580e3ee7c4..056daa0010f9 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c | |||
@@ -297,8 +297,6 @@ static int wm8940_add_widgets(struct snd_soc_codec *codec) | |||
297 | if (ret) | 297 | if (ret) |
298 | goto error_ret; | 298 | goto error_ret; |
299 | ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); | 299 | ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
300 | if (ret) | ||
301 | goto error_ret; | ||
302 | 300 | ||
303 | error_ret: | 301 | error_ret: |
304 | return ret; | 302 | return ret; |
@@ -683,8 +681,6 @@ static int wm8940_resume(struct snd_soc_codec *codec) | |||
683 | } | 681 | } |
684 | } | 682 | } |
685 | ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); | 683 | ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); |
686 | if (ret) | ||
687 | goto error_ret; | ||
688 | 684 | ||
689 | error_ret: | 685 | error_ret: |
690 | return ret; | 686 | return ret; |
@@ -730,9 +726,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) | |||
730 | if (ret) | 726 | if (ret) |
731 | return ret; | 727 | return ret; |
732 | ret = wm8940_add_widgets(codec); | 728 | ret = wm8940_add_widgets(codec); |
733 | if (ret) | ||
734 | return ret; | ||
735 | |||
736 | return ret; | 729 | return ret; |
737 | } | 730 | } |
738 | 731 | ||