[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable
From: |
Peter Maydell |
Subject: |
[PATCH 2/4] hw/misc/arm_sysctl.c: Avoid shadowing local variable |
Date: |
Fri, 22 Sep 2023 16:29:42 +0100 |
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>
---
hw/misc/arm_sysctl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/misc/arm_sysctl.c b/hw/misc/arm_sysctl.c
index 42d46938543..3e4f4b05244 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;
}
}
}
--
2.34.1