OSDN Git Service

ASoC: soc-pcm: remove redundant assignment
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Thu, 18 Feb 2021 22:19:17 +0000 (16:19 -0600)
committerMark Brown <broonie@kernel.org>
Wed, 10 Mar 2021 13:06:54 +0000 (13:06 +0000)
cppcheck warning:

sound/soc/soc-pcm.c:2398:7: style: Variable 'ret' is reassigned a
value before the old one has been used. [redundantAssignment]
  ret = -EINVAL;
      ^
sound/soc/soc-pcm.c:2395:7: note: ret is assigned
  ret = -EINVAL;
      ^
sound/soc/soc-pcm.c:2398:7: note: ret is overwritten
  ret = -EINVAL;
      ^

This looks like a copy/paste or git merge issue.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210218221921.88991-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-pcm.c

index 14d85ca..12fd10a 100644 (file)
@@ -2395,7 +2395,6 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)
        /* Only start the BE if the FE is ready */
        if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_FREE ||
                fe->dpcm[stream].state == SND_SOC_DPCM_STATE_CLOSE) {
-               ret = -EINVAL;
                dev_err(fe->dev, "ASoC: FE %s is not ready %d\n",
                        fe->dai_link->name, fe->dpcm[stream].state);
                ret = -EINVAL;