Commit bca6b399 authored by Greg Dietsche's avatar Greg Dietsche Committed by Mark Brown

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: default avatarGreg Dietsche <Gregory.Dietsche@cuw.edu>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 46758dee
...@@ -297,8 +297,6 @@ static int wm8940_add_widgets(struct snd_soc_codec *codec) ...@@ -297,8 +297,6 @@ static int wm8940_add_widgets(struct snd_soc_codec *codec)
if (ret) if (ret)
goto error_ret; goto error_ret;
ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
if (ret)
goto error_ret;
error_ret: error_ret:
return ret; return ret;
...@@ -683,8 +681,6 @@ static int wm8940_resume(struct snd_soc_codec *codec) ...@@ -683,8 +681,6 @@ static int wm8940_resume(struct snd_soc_codec *codec)
} }
} }
ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY); ret = wm8940_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
if (ret)
goto error_ret;
error_ret: error_ret:
return ret; return ret;
...@@ -730,9 +726,6 @@ static int wm8940_probe(struct snd_soc_codec *codec) ...@@ -730,9 +726,6 @@ static int wm8940_probe(struct snd_soc_codec *codec)
if (ret) if (ret)
return ret; return ret;
ret = wm8940_add_widgets(codec); ret = wm8940_add_widgets(codec);
if (ret)
return ret;
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment