mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-04 01:49:36 +00:00
Code Issues Releases Wiki Activity

ASoC: pcm: delete some dead code

Browse source 
I've removed several unreachable returns.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Dan Carpenter 2013-01-10 11:59:57 +03:00 committed by Mark Brown
parent ff541f4b2a
commit fffc0ca29f
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sound/soc/soc-pcm.c
View file

@ -1728,20 +1728,16 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)
/* startup must always be called for new BEs */ /* startup must always be called for new BEs */
ret = dpcm_be_dai_startup(fe, stream); ret = dpcm_be_dai_startup(fe, stream);
if (ret < 0) { if (ret < 0)
goto disconnect; goto disconnect;
return ret;
}
/* keep going if FE state is > open */ /* keep going if FE state is > open */
if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_OPEN) if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_OPEN)
return 0; return 0;
ret = dpcm_be_dai_hw_params(fe, stream); ret = dpcm_be_dai_hw_params(fe, stream);
if (ret < 0) { if (ret < 0)
goto close; goto close;
return ret;
}
/* keep going if FE state is > hw_params */ /* keep going if FE state is > hw_params */
if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_PARAMS) 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)
ret = dpcm_be_dai_prepare(fe, stream); ret = dpcm_be_dai_prepare(fe, stream);
if (ret < 0) { if (ret < 0)
goto hw_free; goto hw_free;
return ret;
}
/* run the stream event for each BE */ /* run the stream event for each BE */
dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_NOP); dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_NOP);