[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 38/55] microbit: Tidy up sysbus_init_child_obj() @child argum
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
Re: [PATCH 38/55] microbit: Tidy up sysbus_init_child_obj() @child argument |
|
Date: |
Wed, 20 May 2020 16:54:37 +0200 |
On Wed, May 20, 2020 at 4:49 PM Markus Armbruster <address@hidden> wrote:
>
> Philippe Mathieu-Daudé <address@hidden> writes:
>
> > On 5/19/20 4:55 PM, Markus Armbruster wrote:
> >> 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 <address@hidden>
> >> ---
> >> 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);
> >
> > i2c is only used once now, maybe you can remove it and directly use
> > in-place.
>
> Twice. After PATCH 47, both uses will be SYS_BUS_DEVICE(i2c). I think
> I should either eliminate the variable, or change it to SysBusDevice *.
Pointless double-cast, we can directly use SYS_BUS_DEVICE(&s->nrf51).
>
> > Regardless:
> >
> > Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
>
> Thanks!
>
> >> mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(i2c), 0);
> >>
>
- [PATCH 11/55] qdev: Convert uses of qdev_set_parent_bus() manually, (continued)
- [PATCH 11/55] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/05/19
- [PATCH 32/55] auxbus: Eliminate aux_create_slave(), Markus Armbruster, 2020/05/19
- [PATCH 18/55] isa: Convert uses of isa_create() with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 33/55] qom: Tidy up a few object_initialize_child() calls, Markus Armbruster, 2020/05/19
- [PATCH 12/55] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/05/19
- [PATCH 38/55] microbit: Tidy up sysbus_init_child_obj() @child argument, Markus Armbruster, 2020/05/19
- [PATCH 16/55] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/05/19
- [PATCH 24/55] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/05/19
- [PATCH 10/55] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 41/55] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2, Markus Armbruster, 2020/05/19
- [PATCH 14/55] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 44/55] qdev: Drop qdev_realize() support for null bus, Markus Armbruster, 2020/05/19
- [PATCH 34/55] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/05/19
- [PATCH 39/55] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 1, Markus Armbruster, 2020/05/19