Commit e9a82986 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

microbit: Eliminate two local variables in microbit_init() 



Suggested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-53-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 034b61d7

hw/arm/microbit.c

+6 −8
Original line number Diff line number Diff line
@@ -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(&s->nrf51);

    Object *i2c = OBJECT(&s->i2c);



    object_initialize_child(OBJECT(machine), "nrf51", &s->nrf51,

                            TYPE_NRF51_SOC);

    qdev_prop_set_chr(DEVICE(&s->nrf51), "serial0", serial_hd(0));

    object_property_set_link(soc, OBJECT(system_memory), "memory",

                             &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(soc), &error_fatal);

    object_property_set_link(OBJECT(&s->nrf51), OBJECT(system_memory),

                             "memory", &error_fatal);

    sysbus_realize(SYS_BUS_DEVICE(&s->nrf51), &error_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", &s->i2c,

                            TYPE_MICROBIT_I2C);

    sysbus_realize(SYS_BUS_DEVICE(i2c), &error_fatal);

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0);

    sysbus_realize(SYS_BUS_DEVICE(&s->i2c), &error_fatal);

    mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->i2c), 0);

    memory_region_add_subregion_overlap(&s->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)