[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 66/84] microbit: Tidy up sysbus_init_child_obj() @child argument
From: |
Markus Armbruster |
Subject: |
[PULL 66/84] microbit: Tidy up sysbus_init_child_obj() @child argument |
Date: |
Mon, 15 Jun 2020 22:39:50 +0200 |
The callers of sysbus_init_child_obj() commonly pass either &child,
sizeof(child), or pchild, sizeof(*pchild). Tidy up two that don't,
mostly to keep future commits simpler.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-41-armbru@redhat.com>
---
hw/arm/microbit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index ef213695bd..72fab429c4 100644
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -39,7 +39,7 @@ static void microbit_init(MachineState *machine)
Object *soc = OBJECT(&s->nrf51);
Object *i2c = OBJECT(&s->i2c);
- sysbus_init_child_obj(OBJECT(machine), "nrf51", soc, sizeof(s->nrf51),
+ sysbus_init_child_obj(OBJECT(machine), "nrf51", &s->nrf51,
sizeof(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",
@@ -51,7 +51,7 @@ static void microbit_init(MachineState *machine)
* hack until we implement the nRF51 TWI controller properly and the
* magnetometer/accelerometer devices.
*/
- sysbus_init_child_obj(OBJECT(machine), "microbit.twi", i2c,
+ sysbus_init_child_obj(OBJECT(machine), "microbit.twi", &s->i2c,
sizeof(s->i2c), TYPE_MICROBIT_I2C);
object_property_set_bool(i2c, true, "realized", &error_fatal);
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0);
--
2.26.2
- [PULL 45/84] isa: Convert uses of isa_create() with Coccinelle, (continued)
- [PULL 45/84] isa: Convert uses of isa_create() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 57/84] auxbus: Rename aux_init_bus() to aux_bus_init(), Markus Armbruster, 2020/06/15
- [PULL 50/84] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/06/15
- [PULL 52/84] usb: New usb_new(), usb_realize_and_unref(), Markus Armbruster, 2020/06/15
- [PULL 58/84] auxbus: New aux_bus_realize(), pairing with aux_bus_init(), Markus Armbruster, 2020/06/15
- [PULL 56/84] qdev: qdev_create(), qdev_try_create() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 39/84] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/06/15
- [PULL 65/84] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/06/15
- [PULL 83/84] qdev: qdev_init_nofail() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 54/84] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 66/84] microbit: Tidy up sysbus_init_child_obj() @child argument,
Markus Armbruster <=
- [PULL 72/84] qdev: Drop qdev_realize() support for null bus, Markus Armbruster, 2020/06/15
- [PULL 34/84] qdev: Convert to qdev_unrealize() manually, Markus Armbruster, 2020/06/15
- [PULL 43/84] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 13/84] pnv/phb4: Delete unused "pnv-phb4-pec-stack" devices, Markus Armbruster, 2020/06/15
- [PULL 55/84] usb: Eliminate usb_try_create_simple(), Markus Armbruster, 2020/06/15
- [PULL 63/84] macio: Convert use of qdev_set_parent_bus(), Markus Armbruster, 2020/06/15
- [PULL 84/84] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, Markus Armbruster, 2020/06/15
- [PULL 74/84] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2, Markus Armbruster, 2020/06/15
- [PULL 28/84] Revert "hw/prep: realize the PCI root bus as part of the prep init", Markus Armbruster, 2020/06/15
- [PULL 81/84] qdev: Use qdev_realize() in qdev_device_add(), Markus Armbruster, 2020/06/15