Re: [PATCH RESEND v3 52/58] microbit: Eliminate two local variables in microbit_init()

[Philippe Mathieu-Daudé]

On 6/10/20 7:32 AM, Markus Armbruster wrote:
> Suggested-by: Philippe Mathieu-Daudé 
> Signed-off-by: Markus Armbruster 
> Reviewed-by: Paolo Bonzini 
> ---
>  hw/arm/microbit.c | 14 ++
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
> index d20ebd3aad..8fe42c9d6a 100644
> --- a/hw/arm/microbit.c
> +++ b/hw/arm/microbit.c
> @@ -36,15 +36,13 @@ static void microbit_init(MachineState *machine)
>  MicrobitMachineState *s = MICROBIT_MACHINE(machine);
>  MemoryRegion *system_memory = get_system_memory();
>  MemoryRegion *mr;
> -Object *soc = OBJECT(>nrf51);
> -Object *i2c = OBJECT(>i2c);

Thanks for this new patch.

Reviewed-by: Philippe Mathieu-Daudé 

[PATCH RESEND v3 52/58] microbit: Eliminate two local variables in microbit_init()

[Markus Armbruster]

Suggested-by: Philippe Mathieu-Daudé 
Signed-off-by: Markus Armbruster 
Reviewed-by: Paolo Bonzini 
---
 hw/arm/microbit.c | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index d20ebd3aad..8fe42c9d6a 100644
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -36,15 +36,13 @@ static void microbit_init(MachineState *machine)
 MicrobitMachineState *s = MICROBIT_MACHINE(machine);
 MemoryRegion *system_memory = get_system_memory();
 MemoryRegion *mr;
-Object *soc = OBJECT(>nrf51);
-Object *i2c = OBJECT(>i2c);
 
 object_initialize_child(OBJECT(machine), "nrf51", >nrf51,
 TYPE_NRF51_SOC);
 qdev_prop_set_chr(DEVICE(>nrf51), "serial0", serial_hd(0));
-object_property_set_link(soc, OBJECT(system_memory), "memory",
- _fatal);
-sysbus_realize(SYS_BUS_DEVICE(soc), _fatal);
+object_property_set_link(OBJECT(>nrf51), OBJECT(system_memory),
+ "memory", _fatal);
+sysbus_realize(SYS_BUS_DEVICE(>nrf51), _fatal);
 
 /*
  * Overlap the TWI stub device into the SoC.  This is a microbit-specific
@@ -53,13 +51,13 @@ static void microbit_init(MachineState *machine)
  */
 object_initialize_child(OBJECT(machine), "microbit.twi", >i2c,
 TYPE_MICROBIT_I2C);
-sysbus_realize(SYS_BUS_DEVICE(i2c), _fatal);
-mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0);
+sysbus_realize(SYS_BUS_DEVICE(>i2c), _fatal);
+mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(>i2c), 0);
 memory_region_add_subregion_overlap(>nrf51.container, NRF51_TWI_BASE,
 mr, -1);
 
 armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename,
-   NRF51_SOC(soc)->flash_size);
+   s->nrf51.flash_size);
 }
 
 static void microbit_machine_class_init(ObjectClass *oc, void *data)
-- 
2.26.2