aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2023-09-22 16:29:42 +0100
committerMarkus Armbruster <armbru@redhat.com>2023-09-29 10:07:18 +0200
commitb2e7e2048bbe7a82b921d9ca71da9aec1668fcfe (patch)
tree5ccac24a16775a7c1c68382977059f4072542c5a /hw
parent33b3b4aded2eb56d505d563e4788e0654a7e9f2b (diff)
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/misc/arm_sysctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 42d4693854..3e4f4b0524 100644
--- a/hw/misc/arm_sysctl.c
+++ b/hw/misc/arm_sysctl.c
@@ -534,12 +534,12 @@ static void arm_sysctl_write(void *opaque, hwaddr offset,
s->sys_cfgstat |= 2; /* error */
}
} else {
- uint32_t val;
+ uint32_t data;
if (!vexpress_cfgctrl_read(s, dcc, function, site, position,
- device, &val)) {
+ device, &data)) {
s->sys_cfgstat |= 2; /* error */
} else {
- s->sys_cfgdata = val;
+ s->sys_cfgdata = data;
}
}
}