aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-11-23 08:06:50 +0100
committerMarkus Armbruster <armbru@redhat.com>2022-12-14 16:19:35 +0100
commit6c5aaee4b61eb8bf60c7c30365432710b4346421 (patch)
tree5d152fefd3edee5067710538dc80cd7438f0e511
parent851fd4a01dcf579f96f18d41b3e4bf369b64ef3a (diff)
downloadqemu-6c5aaee4b61eb8bf60c7c30365432710b4346421.zip
qemu-6c5aaee4b61eb8bf60c7c30365432710b4346421.tar.gz
qemu-6c5aaee4b61eb8bf60c7c30365432710b4346421.tar.bz2
ppc4xx_sdram: Simplify sdram_ddr_size() to return
Suggested-by: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <87a64i87zp.fsf@pond.sub.org> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-rw-r--r--hw/ppc/ppc4xx_sdram.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c
index 54bf9a2..a24c80b 100644
--- a/hw/ppc/ppc4xx_sdram.c
+++ b/hw/ppc/ppc4xx_sdram.c
@@ -192,17 +192,13 @@ static inline hwaddr sdram_ddr_base(uint32_t bcr)
static hwaddr sdram_ddr_size(uint32_t bcr)
{
- hwaddr size;
- int sh;
+ int sh = (bcr >> 17) & 0x7;
- sh = (bcr >> 17) & 0x7;
if (sh == 7) {
- size = -1;
- } else {
- size = (4 * MiB) << sh;
+ return -1;
}
- return size;
+ return (4 * MiB) << sh;
}
static uint32_t sdram_ddr_dcr_read(void *opaque, int dcrn)