Commit fffc0ca2 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

ASoC: pcm: delete some dead code 



I've removed several unreachable returns.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ff541f4b

sound/soc/soc-pcm.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -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);