Skip to content

Commit

Permalink
ASoC: pcm: delete some dead code
Browse files Browse the repository at this point in the history
I've removed several unreachable returns.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Dan Carpenter authored and Mark Brown committed Jan 12, 2013
1 parent ff541f4 commit fffc0ca
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions sound/soc/soc-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1728,31 +1728,25 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)

/* startup must always be called for new BEs */
ret = dpcm_be_dai_startup(fe, stream);
if (ret < 0) {
if (ret < 0)
goto disconnect;
return ret;
}

/* keep going if FE state is > open */
if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_OPEN)
return 0;

ret = dpcm_be_dai_hw_params(fe, stream);
if (ret < 0) {
if (ret < 0)
goto close;
return ret;
}

/* keep going if FE state is > hw_params */
if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_PARAMS)
return 0;


ret = dpcm_be_dai_prepare(fe, stream);
if (ret < 0) {
if (ret < 0)
goto hw_free;
return ret;
}

/* run the stream event for each BE */
dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_NOP);
Expand Down

0 comments on commit fffc0ca

Please sign in to comment.