| Message ID | d134d64f13258d1f157b445fedb1e86cf3abb606.1688586835.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | PPC440 devices misc clean up | expand |
On 7/5/23 17:12, BALATON Zoltan wrote: > Some places already use get_system_memory() directly so replace the > remaining uses and drop the local variable. > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > hw/ppc/sam460ex.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c > index aaa8d2f4a5..f098226974 100644 > --- a/hw/ppc/sam460ex.c > +++ b/hw/ppc/sam460ex.c > @@ -266,7 +266,6 @@ static void main_cpu_reset(void *opaque) > > static void sam460ex_init(MachineState *machine) > { > - MemoryRegion *address_space_mem = get_system_memory(); > MemoryRegion *isa = g_new(MemoryRegion, 1); > MemoryRegion *l2cache_ram = g_new(MemoryRegion, 1); > DeviceState *uic[4]; > @@ -406,7 +405,8 @@ static void sam460ex_init(MachineState *machine) > /* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */ > memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 * KiB, > &error_abort); > - memory_region_add_subregion(address_space_mem, 0x400000000LL, l2cache_ram); > + memory_region_add_subregion(get_system_memory(), 0x400000000LL, > + l2cache_ram); > > /* USB */ > sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400, > @@ -444,13 +444,13 @@ static void sam460ex_init(MachineState *machine) > /* SoC has 4 UARTs > * but board has only one wired and two are present in fdt */ > if (serial_hd(0) != NULL) { > - serial_mm_init(address_space_mem, 0x4ef600300, 0, > + serial_mm_init(get_system_memory(), 0x4ef600300, 0, > qdev_get_gpio_in(uic[1], 1), > PPC_SERIAL_MM_BAUDBASE, serial_hd(0), > DEVICE_BIG_ENDIAN); > } > if (serial_hd(1) != NULL) { > - serial_mm_init(address_space_mem, 0x4ef600400, 0, > + serial_mm_init(get_system_memory(), 0x4ef600400, 0, > qdev_get_gpio_in(uic[0], 1), > PPC_SERIAL_MM_BAUDBASE, serial_hd(1), > DEVICE_BIG_ENDIAN);
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index aaa8d2f4a5..f098226974 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -266,7 +266,6 @@ static void main_cpu_reset(void *opaque) static void sam460ex_init(MachineState *machine) { - MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *isa = g_new(MemoryRegion, 1); MemoryRegion *l2cache_ram = g_new(MemoryRegion, 1); DeviceState *uic[4]; @@ -406,7 +405,8 @@ static void sam460ex_init(MachineState *machine) /* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */ memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 * KiB, &error_abort); - memory_region_add_subregion(address_space_mem, 0x400000000LL, l2cache_ram); + memory_region_add_subregion(get_system_memory(), 0x400000000LL, + l2cache_ram); /* USB */ sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400, @@ -444,13 +444,13 @@ static void sam460ex_init(MachineState *machine) /* SoC has 4 UARTs * but board has only one wired and two are present in fdt */ if (serial_hd(0) != NULL) { - serial_mm_init(address_space_mem, 0x4ef600300, 0, + serial_mm_init(get_system_memory(), 0x4ef600300, 0, qdev_get_gpio_in(uic[1], 1), PPC_SERIAL_MM_BAUDBASE, serial_hd(0), DEVICE_BIG_ENDIAN); } if (serial_hd(1) != NULL) { - serial_mm_init(address_space_mem, 0x4ef600400, 0, + serial_mm_init(get_system_memory(), 0x4ef600400, 0, qdev_get_gpio_in(uic[0], 1), PPC_SERIAL_MM_BAUDBASE, serial_hd(1), DEVICE_BIG_ENDIAN);
Some places already use get_system_memory() directly so replace the remaining uses and drop the local variable. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- hw/ppc/sam460ex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)