hw/arm/pxa2xx: Simplify pxa255_init()

Since pxa255_init() must map the device in the system memory,
there is no point in passing get_system_memory() by argument.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230109115316.2235-2-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-01-09 12:53:04 +01:00 committed by Peter Maydell
parent ce848378b9
commit abf8361cf7
4 changed files with 6 additions and 5 deletions

View File

@ -51,12 +51,11 @@ static void connex_init(MachineState *machine)
{
PXA2xxState *cpu;
DriveInfo *dinfo;
MemoryRegion *address_space_mem = get_system_memory();
uint32_t connex_rom = 0x01000000;
uint32_t connex_ram = 0x04000000;
cpu = pxa255_init(address_space_mem, connex_ram);
cpu = pxa255_init(connex_ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo && !qtest_enabled()) {

View File

@ -11,6 +11,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
#include "exec/address-spaces.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
@ -2230,8 +2231,9 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
}
/* Initialise a PXA255 integrated chip (ARM based core). */
PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
PXA2xxState *pxa255_init(unsigned int sdram_size)
{
MemoryRegion *address_space = get_system_memory();
PXA2xxState *s;
int i;
DriveInfo *dinfo;

View File

@ -242,7 +242,7 @@ static void tosa_init(MachineState *machine)
TC6393xbState *tmio;
DeviceState *scp0, *scp1;
mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
mpu = pxa255_init(tosa_binfo.ram_size);
memory_region_init_rom(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);
memory_region_add_subregion(address_space_mem, 0, rom);

View File

@ -195,6 +195,6 @@ struct PXA2xxI2SState {
PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size,
const char *revision);
PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size);
PXA2xxState *pxa255_init(unsigned int sdram_size);
#endif /* PXA_H */