diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2021-08-05 10:11:05 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2021-08-05 15:37:30 +0100 |
| commit | 29155bba18182daf46e0c4c784a2344d44ef082a (patch) | |
| tree | d380d46ecb905c955cdc0d74469e430df4f16de3 /sound/soc/soc-dapm.c | |
| parent | ASoC: soc-dapm: cleanup cppcheck warning at dapm_connect_mux() (diff) | |
| download | linux-dev-29155bba18182daf46e0c4c784a2344d44ef082a.tar.xz linux-dev-29155bba18182daf46e0c4c784a2344d44ef082a.zip | |
ASoC: soc-dapm: cleanup cppcheck warning at dapm_set_mixer_path_status()
This patch cleanups below cppcheck warning, and its related code.
unsigned int val;
^
sound/soc/soc-dapm.c:789:15: style: The scope of the variable 'val' can be reduced. [variableScope]
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87v94ku252.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1c0457715008..0ccc59287513 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -782,14 +782,14 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i, struct soc_mixer_control *mc = (struct soc_mixer_control *) p->sink->kcontrol_news[i].private_value; unsigned int reg = mc->reg; - unsigned int shift = mc->shift; - unsigned int max = mc->max; - unsigned int mask = (1 << fls(max)) - 1; unsigned int invert = mc->invert; - unsigned int val; if (reg != SND_SOC_NOPM) { - val = soc_dapm_read(p->sink->dapm, reg); + unsigned int shift = mc->shift; + unsigned int max = mc->max; + unsigned int mask = (1 << fls(max)) - 1; + unsigned int val = soc_dapm_read(p->sink->dapm, reg); + /* * The nth_path argument allows this function to know * which path of a kcontrol it is setting the initial |