ASoC: soc-compress: consolidate two identical branches
authorDaniel Mack <daniel@zonque.org>
Sun, 19 Oct 2014 07:07:35 +0000 (09:07 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 22 Oct 2014 10:36:36 +0000 (11:36 +0100)
The actions taken in both branches are identical, so we can simplify the
code. Spotted by Coverity.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-compress.c

index cecfab3cc9488e14ee018cff6ec327522f203d7d..590a82f01d0bdc2cc2fa39b89c006a2ec8b2b589 100644 (file)
@@ -258,10 +258,7 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream)
        list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be)
                dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;
 
-       if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-               dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);
-       else
-               dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);
+       dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_STOP);
 
        fe->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
        fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO;
@@ -456,11 +453,7 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
        if (ret < 0)
                goto out;
 
-       if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-               dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);
-       else
-               dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);
-
+       dpcm_dapm_stream_event(fe, stream, SND_SOC_DAPM_STREAM_START);
        fe->dpcm[stream].state = SND_SOC_DPCM_STATE_PREPARE;
 
 out: