diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-01-10 03:59:57 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-11 19:05:58 -0500 |
commit | fffc0ca29fdf3a786e74082c698c701d6ebdf720 (patch) | |
tree | 686457c299d1924696eaa20a59eae7b2439829ba | |
parent | ff541f4b2a7546ffa8edf123f4b3b49bb24574e2 (diff) |
ASoC: pcm: delete some dead code
I've removed several unreachable returns.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/soc-pcm.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index d7711fce119b..6006b371b79d 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c | |||
@@ -1728,20 +1728,16 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) | |||
1728 | 1728 | ||
1729 | /* startup must always be called for new BEs */ | 1729 | /* startup must always be called for new BEs */ |
1730 | ret = dpcm_be_dai_startup(fe, stream); | 1730 | ret = dpcm_be_dai_startup(fe, stream); |
1731 | if (ret < 0) { | 1731 | if (ret < 0) |
1732 | goto disconnect; | 1732 | goto disconnect; |
1733 | return ret; | ||
1734 | } | ||
1735 | 1733 | ||
1736 | /* keep going if FE state is > open */ | 1734 | /* keep going if FE state is > open */ |
1737 | if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_OPEN) | 1735 | if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_OPEN) |
1738 | return 0; | 1736 | return 0; |
1739 | 1737 | ||
1740 | ret = dpcm_be_dai_hw_params(fe, stream); | 1738 | ret = dpcm_be_dai_hw_params(fe, stream); |
1741 | if (ret < 0) { | 1739 | if (ret < 0) |
1742 | goto close; | 1740 | goto close; |
1743 | return ret; | ||
1744 | } | ||
1745 | 1741 | ||
1746 | /* keep going if FE state is > hw_params */ | 1742 | /* keep going if FE state is > hw_params */ |
1747 | if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_PARAMS) | 1743 | if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_PARAMS) |
@@ -1749,10 +1745,8 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) | |||
1749 | 1745 | ||
1750 | 1746 | ||
1751 | ret = dpcm_be_dai_prepare(fe, stream); | 1747 | ret = dpcm_be_dai_prepare(fe, stream); |
1752 | if (ret < 0) { | 1748 | if (ret < 0) |
1753 | goto hw_free; | 1749 | goto hw_free; |
1754 | return ret; | ||
1755 | } | ||
1756 | 1750 | ||
1757 | /* run the stream event for each BE */ | 1751 | /* run the stream event for each BE */ |
1758 | dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_NOP); | 1752 | dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_NOP); |