ASoC: soc-dapm: cleanup cppcheck warning at snd_soc_dapm_del_route()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thu, 5 Aug 2021 01:11:28 +0000 (10:11 +0900)
committerMark Brown <broonie@kernel.org>
Thu, 5 Aug 2021 14:37:36 +0000 (15:37 +0100)
This patch cleanups below cppcheck warning.

sound/soc/soc-dapm.c:3007:30: style: The scope of the variable 'wsource' can be reduced. [variableScope]
 struct snd_soc_dapm_widget *wsource, *wsink;
                             ^
sound/soc/soc-dapm.c:3007:40: style: The scope of the variable 'wsink' can be reduced. [variableScope]
 struct snd_soc_dapm_widget *wsource, *wsink;
                                       ^

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o8acu24f.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-dapm.c

index bd3b443..c7fb142 100644 (file)
@@ -3006,7 +3006,6 @@ err:
 static int snd_soc_dapm_del_route(struct snd_soc_dapm_context *dapm,
                                  const struct snd_soc_dapm_route *route)
 {
-       struct snd_soc_dapm_widget *wsource, *wsink;
        struct snd_soc_dapm_path *path, *p;
        const char *sink;
        const char *source;
@@ -3044,8 +3043,8 @@ static int snd_soc_dapm_del_route(struct snd_soc_dapm_context *dapm,
        }
 
        if (path) {
-               wsource = path->source;
-               wsink = path->sink;
+               struct snd_soc_dapm_widget *wsource = path->source;
+               struct snd_soc_dapm_widget *wsink = path->sink;
 
                dapm_mark_dirty(wsource, "Route removed");
                dapm_mark_dirty(wsink, "Route removed");