[2/5] ASoC: soc-topology: cleanup cppcheck warning at soc_tplg_dai_elems_load()

Commit Message

Kuninori Morimoto Aug. 2, 2021, 6 a.m. UTC

From: Kuninori Morimoto <[e-mail]>

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 <[e-mail]>
---
 sound/soc/soc-topology.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 9aa7c9c4768b..359c6ac22153 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -2346,15 +2346,16 @@  static int soc_tplg_dai_config(struct soc_tplg *tplg,
 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;