[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RESEND v3 40/58] microbit: Tidy up sysbus_init_child_obj() @child
From: |
Markus Armbruster |
Subject: |
[PATCH RESEND v3 40/58] microbit: Tidy up sysbus_init_child_obj() @child argument |
Date: |
Wed, 10 Jun 2020 07:32:29 +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>
---
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
- [PATCH RESEND v3 32/58] auxbus: New aux_bus_realize(), pairing with aux_bus_init(), (continued)
- [PATCH RESEND v3 32/58] auxbus: New aux_bus_realize(), pairing with aux_bus_init(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 33/58] auxbus: Convert a use of qdev_set_parent_bus(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 17/58] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 46/58] qdev: Drop qdev_realize() support for null bus, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 13/58] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 42/58] hw/arm/armsse: Pass correct child size to sysbus_init_child_obj(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 25/58] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 15/58] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 44/58] sysbus: New sysbus_realize(), sysbus_realize_and_unref(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 37/58] macio: Convert use of qdev_set_parent_bus(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 40/58] microbit: Tidy up sysbus_init_child_obj() @child argument,
Markus Armbruster <=
- [PATCH RESEND v3 39/58] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 41/58] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 43/58] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 50/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 51/58] sysbus: sysbus_init_child_obj() is now unused, drop, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 28/58] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 54/58] qdev: Make qdev_realize() support bus-less devices, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 11/58] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 35/58] qom: Tidy up a few object_initialize_child() calls, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 38/58] macio: Eliminate macio_init_child_obj(), Markus Armbruster, 2020/06/10