Re: [PATCH 38/55] microbit: Tidy up sysbus_init_child_obj() @child argument

[Markus Armbruster]

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 *.

>           Regardless:
>
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

Thanks!

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