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

sound/soc/soc-topology.c:2350:27: style: The scope of the variable 'dai' can be reduced. [variableScope]
 struct snd_soc_tplg_dai *dai;
                          ^
sound/soc/soc-topology.c:2352:9: style: The scope of the variable 'ret' can be reduced. [variableScope]
 int i, ret;
        ^

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

index 9aa7c9c4768bd10660957b68b724c10fe13eb608..359c6ac22153a3f724fffc51d3d48fd96d92cd34 100644 (file)
@@ -2346,15 +2346,16 @@ err:
 static int soc_tplg_dai_elems_load(struct soc_tplg *tplg,
                                   struct snd_soc_tplg_hdr *hdr)
 {
-       struct snd_soc_tplg_dai *dai;
        int count;
-       int i, ret;
+       int i;
 
        count = le32_to_cpu(hdr->count);
 
        /* config the existing BE DAIs */
        for (i = 0; i < count; i++) {
-               dai = (struct snd_soc_tplg_dai *)tplg->pos;
+               struct snd_soc_tplg_dai *dai = (struct snd_soc_tplg_dai *)tplg->pos;
+               int ret;
+
                if (le32_to_cpu(dai->size) != sizeof(*dai)) {
                        dev_err(tplg->dev, "ASoC: invalid physical DAI size\n");
                        return -EINVAL;