From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 2 Aug 2021 06:00:42 +0000 (+0900)
Subject: ASoC: soc-topology: cleanup cppcheck warning at soc_tplg_dai_elems_load()
X-Git-Tag: v5.15-rc1~36^2^2~72^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65a4cfdd6f2bc04b0c3d3607c48ceeac999c9424;p=thirdparty%2Flinux.git

ASoC: soc-topology: cleanup cppcheck warning at soc_tplg_dai_elems_load()

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>
---

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 9aa7c9c4768bd..359c6ac22153a 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -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;