From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Subject: [PATCH 4/8] ASoC: sh: rcar: core: rename shadowing variables
Date: Fri, 19 Feb 2021 17:16:31 -0600 [thread overview]
Message-ID: <20210219231635.5749-5-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20210219231635.5749-1-pierre-louis.bossart@linux.intel.com>
cppcheck warnings:
sound/soc/sh/rcar/core.c:1369:22: style: Local variable 'rdai' shadows
outer variable [shadowVariable]
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
^
sound/soc/sh/rcar/core.c:1338:19: note: Shadowed declaration
struct rsnd_dai *rdai;
^
sound/soc/sh/rcar/core.c:1369:22: note: Shadow variable
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
^
sound/soc/sh/rcar/core.c:1380:22: style: Local variable 'rdai' shadows
outer variable [shadowVariable]
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
^
sound/soc/sh/rcar/core.c:1338:19: note: Shadowed declaration
struct rsnd_dai *rdai;
^
sound/soc/sh/rcar/core.c:1380:22: note: Shadow variable
struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
use a different name at lower scope.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/sh/rcar/core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index b1a75509851a..817eea79e0d2 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -1366,10 +1366,10 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
for_each_endpoint_of_node(dai_node, dai_np) {
__rsnd_dai_probe(priv, dai_np, dai_i);
if (rsnd_is_gen3(priv)) {
- struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
+ struct rsnd_dai *dai = rsnd_rdai_get(priv, dai_i);
- rsnd_parse_connect_graph(priv, &rdai->playback, dai_np);
- rsnd_parse_connect_graph(priv, &rdai->capture, dai_np);
+ rsnd_parse_connect_graph(priv, &dai->playback, dai_np);
+ rsnd_parse_connect_graph(priv, &dai->capture, dai_np);
}
dai_i++;
}
@@ -1377,10 +1377,10 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
for_each_child_of_node(dai_node, dai_np) {
__rsnd_dai_probe(priv, dai_np, dai_i);
if (rsnd_is_gen3(priv)) {
- struct rsnd_dai *rdai = rsnd_rdai_get(priv, dai_i);
+ struct rsnd_dai *dai = rsnd_rdai_get(priv, dai_i);
- rsnd_parse_connect_simple(priv, &rdai->playback, dai_np);
- rsnd_parse_connect_simple(priv, &rdai->capture, dai_np);
+ rsnd_parse_connect_simple(priv, &dai->playback, dai_np);
+ rsnd_parse_connect_simple(priv, &dai->capture, dai_np);
}
dai_i++;
}
--
2.25.1
next prev parent reply other threads:[~2021-02-19 23:20 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-19 23:16 [PATCH 0/8] ASoC: sh: remove cppcheck warnings Pierre-Louis Bossart
2021-02-19 23:16 ` [PATCH 1/8] ASoC: sh: dma-sh7760: remove unused variable Pierre-Louis Bossart
2021-02-19 23:16 ` [PATCH 2/8] ASoC: sh: rcar: align function prototypes Pierre-Louis Bossart
2021-02-19 23:16 ` [PATCH 3/8] ASoC: sh: rcar: simplify return Pierre-Louis Bossart
2021-02-19 23:16 ` Pierre-Louis Bossart [this message]
2021-02-21 23:27 ` [PATCH 4/8] ASoC: sh: rcar: core: rename shadowing variables Kuninori Morimoto
2021-02-22 15:41 ` Pierre-Louis Bossart
2021-02-24 23:13 ` Kuninori Morimoto
2021-02-19 23:16 ` [PATCH 5/8] ASoC: sh: rcar: ctu: add missing error check Pierre-Louis Bossart
2021-02-19 23:16 ` [PATCH 6/8] ASoC: sh: rcar: ssi: remove redundant assignment Pierre-Louis Bossart
2021-02-19 23:16 ` [PATCH 7/8] ASoC: sh: siu_pcm: remove useless assignment Pierre-Louis Bossart
2021-02-19 23:16 ` [PATCH 8/8] ASoC: sh: siu_pcm: remove unused variable Pierre-Louis Bossart
2021-02-21 23:32 ` [PATCH 0/8] ASoC: sh: remove cppcheck warnings Kuninori Morimoto
2021-03-01 23:34 ` (subset) " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210219231635.5749-5-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).