[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 5/8] hw/misc/macio: Remove some single use local variables
From: |
Mark Cave-Ayland |
Subject: |
[PULL 5/8] hw/misc/macio: Remove some single use local variables |
Date: |
Mon, 6 Feb 2023 22:07:19 +0000 |
From: BALATON Zoltan <balaton@eik.bme.hu>
Drop some local variables that could just be substituted at the single
place they were used. This makes the code shorter and simpler.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id:
<165a4ea190af7c09832f50f02004fad82f704898.1674001242.git.balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/misc/macio/macio.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 4d7223cc85..ae2a9a960d 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -53,10 +53,8 @@
*/
static void macio_escc_legacy_setup(MacIOState *s)
{
- ESCCState *escc = ESCC(&s->escc);
- SysBusDevice *sbd = SYS_BUS_DEVICE(escc);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(&s->escc);
MemoryRegion *escc_legacy = g_new(MemoryRegion, 1);
- MemoryRegion *bar = &s->bar;
int i;
static const int maps[] = {
0x00, 0x00, /* Command B */
@@ -80,16 +78,15 @@ static void macio_escc_legacy_setup(MacIOState *s)
memory_region_add_subregion(escc_legacy, maps[i], port);
}
- memory_region_add_subregion(bar, 0x12000, escc_legacy);
+ memory_region_add_subregion(&s->bar, 0x12000, escc_legacy);
}
static void macio_bar_setup(MacIOState *s)
{
- ESCCState *escc = ESCC(&s->escc);
- SysBusDevice *sbd = SYS_BUS_DEVICE(escc);
- MemoryRegion *bar = &s->bar;
+ SysBusDevice *sbd = SYS_BUS_DEVICE(&s->escc);
+ MemoryRegion *bar = sysbus_mmio_get_region(sbd, 0);
- memory_region_add_subregion(bar, 0x13000, sysbus_mmio_get_region(sbd, 0));
+ memory_region_add_subregion(&s->bar, 0x13000, bar);
macio_escc_legacy_setup(s);
}
--
2.30.2
- [PULL 0/8] qemu-macppc queue 20230206, Mark Cave-Ayland, 2023/02/06
- [PULL 1/8] input/adb: Only include header where needed, Mark Cave-Ayland, 2023/02/06
- [PULL 2/8] mac_{old, new}world: Use local variable instead of qdev_get_machine(), Mark Cave-Ayland, 2023/02/06
- [PULL 3/8] hw/misc/macio: Avoid some QOM casts, Mark Cave-Ayland, 2023/02/06
- [PULL 4/8] hw/misc/macio: Rename sysbus_dev to sbd for consistency and brevity, Mark Cave-Ayland, 2023/02/06
- [PULL 5/8] hw/misc/macio: Remove some single use local variables,
Mark Cave-Ayland <=
- [PULL 6/8] hw/misc/macio: Return bool from functions taking errp, Mark Cave-Ayland, 2023/02/06
- [PULL 7/8] mac_nvram: Add block backend to persist NVRAM contents, Mark Cave-Ayland, 2023/02/06
- [PULL 8/8] mac_oldworld: Allow specifying nvram backing store, Mark Cave-Ayland, 2023/02/06
- Re: [PULL 0/8] qemu-macppc queue 20230206, Peter Maydell, 2023/02/07