[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 52/58] microbit: Eliminate two local variables in microbit_ini
From: |
Markus Armbruster |
Subject: |
[PATCH v2 52/58] microbit: Eliminate two local variables in microbit_init() |
Date: |
Fri, 29 May 2020 15:45:17 +0200 |
Suggested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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(&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)
--
2.21.3
- [PATCH v2 15/58] pci: Convert uses of pci_create() etc. with Coccinelle, (continued)
- [PATCH v2 15/58] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 37/58] macio: Convert use of qdev_set_parent_bus(), Markus Armbruster, 2020/05/29
- [PATCH v2 42/58] hw/arm/armsse: Pass correct child size to sysbus_init_child_obj(), Markus Armbruster, 2020/05/29
- [PATCH v2 41/58] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1, Markus Armbruster, 2020/05/29
- [PATCH v2 39/58] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/05/29
- [PATCH v2 40/58] microbit: Tidy up sysbus_init_child_obj() @child argument, Markus Armbruster, 2020/05/29
- [PATCH v2 17/58] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 24/58] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 46/58] qdev: Drop qdev_realize() support for null bus, Markus Armbruster, 2020/05/29
- [PATCH v2 23/58] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 52/58] microbit: Eliminate two local variables in microbit_init(),
Markus Armbruster <=
- [PATCH v2 51/58] sysbus: sysbus_init_child_obj() is now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 27/58] usb: Convert uses of usb_create(), Markus Armbruster, 2020/05/29
- [PATCH v2 28/58] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 16/58] pci: Convert uses of pci_create() etc. manually, Markus Armbruster, 2020/05/29
- [PATCH v2 58/58] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, Markus Armbruster, 2020/05/29
- [PATCH v2 20/58] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 13/58] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/05/29
- [PATCH v2 36/58] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/05/29
- [PATCH v2 44/58] sysbus: New sysbus_realize(), sysbus_realize_and_unref(), Markus Armbruster, 2020/05/29