ASoC: soc-topology: cleanup cppcheck warning at soc_tplg_dapm_widget_elems_load()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 2 Aug 2021 06:00:52 +0000 (15:00 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 2 Aug 2021 11:21:29 +0000 (12:21 +0100)
This patch cleanups below cppcheck warning.

sound/soc/soc-topology.c:1599:35: style: The scope of the variable 'widget' can be reduced. [variableScope]
 struct snd_soc_tplg_dapm_widget *widget;
                                  ^
sound/soc/soc-topology.c:1600:6: style: The scope of the variable 'ret' can be reduced. [variableScope]
 int ret, count, i;
     ^

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

index 359c6ac..98e08af 100644 (file)
@@ -1583,15 +1583,16 @@ err:
 static int soc_tplg_dapm_widget_elems_load(struct soc_tplg *tplg,
        struct snd_soc_tplg_hdr *hdr)
 {
-       struct snd_soc_tplg_dapm_widget *widget;
-       int ret, count, i;
+       int count, i;
 
        count = le32_to_cpu(hdr->count);
 
        dev_dbg(tplg->dev, "ASoC: adding %d DAPM widgets\n", count);
 
        for (i = 0; i < count; i++) {
-               widget = (struct snd_soc_tplg_dapm_widget *) tplg->pos;
+               struct snd_soc_tplg_dapm_widget *widget = (struct snd_soc_tplg_dapm_widget *) tplg->pos;
+               int ret;
+
                if (le32_to_cpu(widget->size) != sizeof(*widget)) {
                        dev_err(tplg->dev, "ASoC: invalid widget size\n");
                        return -EINVAL;