hw/misc/arm_sysctl.c: Avoid shadowing local variable

Avoid shadowing a local variable in arm_sysctl_write():

../../hw/misc/arm_sysctl.c: In function ‘arm_sysctl_write’:
../../hw/misc/arm_sysctl.c:537:26: warning: declaration of ‘val’ shadows a parameter [-Wshadow=local]
  537 |                 uint32_t val;
      |                          ^~~
../../hw/misc/arm_sysctl.c:388:39: note: shadowed declaration is here
  388 |                              uint64_t val, unsigned size)
      |                              ~~~~~~~~~^~~

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230922152944.3583438-3-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Peter Maydell 2023-09-22 16:29:42 +01:00 committed by Markus Armbruster
parent 33b3b4aded
commit b2e7e2048b

View File

@ -534,12 +534,12 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,
s->sys_cfgstat |= 2; /* error */ s->sys_cfgstat |= 2; /* error */
} }
} else { } else {
uint32_t val; uint32_t data;
if (!vexpress_cfgctrl_read(s, dcc, function, site, position, if (!vexpress_cfgctrl_read(s, dcc, function, site, position,
device, &val)) { device, &data)) {
s->sys_cfgstat |= 2; /* error */ s->sys_cfgstat |= 2; /* error */
} else { } else {
s->sys_cfgdata = val; s->sys_cfgdata = data;
} }
} }
} }