On Mon, Jun 29, 2020 at 07:38:18PM +0200, Philippe Mathieu-Daudé wrote: > We use "new" names for functions that allocate and initialize > device objects: pci_new(), isa_new(), usb_new(). > Let's call this one i2c_slave_new(). Since we have to update > all the callers, also let it return a I2CSlave object.
Reviewed-by: Corey Minyard <cminy...@mvista.com> > > Suggested-by: Markus Armbruster <arm...@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > include/hw/i2c/i2c.h | 2 +- > hw/arm/aspeed.c | 4 ++-- > hw/i2c/core.c | 9 ++++----- > 3 files changed, 7 insertions(+), 8 deletions(-) > > diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h > index d6e3d85faf..18efc668f1 100644 > --- a/include/hw/i2c/i2c.h > +++ b/include/hw/i2c/i2c.h > @@ -79,8 +79,8 @@ int i2c_send_recv(I2CBus *bus, uint8_t *data, bool send); > int i2c_send(I2CBus *bus, uint8_t data); > uint8_t i2c_recv(I2CBus *bus); > > +I2CSlave *i2c_slave_new(const char *name, uint8_t addr); > DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); > -DeviceState *i2c_try_create_slave(const char *name, uint8_t addr); > bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp); > > /* lm832x.c */ > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index 1285bf82c0..54ca36e0b6 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -513,7 +513,7 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState > *bmc) > /* Bus 3: TODO bmp280@77 */ > /* Bus 3: TODO max31785@52 */ > /* Bus 3: TODO dps310@76 */ > - dev = i2c_try_create_slave(TYPE_PCA9552, 0x60); > + dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60)); > qdev_prop_set_string(dev, "description", "pca1"); > i2c_realize_and_unref(dev, aspeed_i2c_get_bus(&soc->i2c, 3), > &error_fatal); > @@ -531,7 +531,7 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState > *bmc) > > smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 11), 0x51, > eeprom_buf); > - dev = i2c_try_create_slave(TYPE_PCA9552, 0x60); > + dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60)); > qdev_prop_set_string(dev, "description", "pca0"); > i2c_realize_and_unref(dev, aspeed_i2c_get_bus(&soc->i2c, 11), > &error_fatal); > diff --git a/hw/i2c/core.c b/hw/i2c/core.c > index acf34a12d6..6eacb4a463 100644 > --- a/hw/i2c/core.c > +++ b/hw/i2c/core.c > @@ -267,13 +267,13 @@ const VMStateDescription vmstate_i2c_slave = { > } > }; > > -DeviceState *i2c_try_create_slave(const char *name, uint8_t addr) > +I2CSlave *i2c_slave_new(const char *name, uint8_t addr) > { > DeviceState *dev; > > dev = qdev_new(name); > qdev_prop_set_uint8(dev, "address", addr); > - return dev; > + return I2C_SLAVE(dev); > } > > bool i2c_realize_and_unref(DeviceState *dev, I2CBus *bus, Error **errp) > @@ -283,10 +283,9 @@ bool i2c_realize_and_unref(DeviceState *dev, I2CBus > *bus, Error **errp) > > DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) > { > - DeviceState *dev; > + DeviceState *dev = DEVICE(i2c_slave_new(name, addr)); > > - dev = i2c_try_create_slave(name, addr); > - i2c_realize_and_unref(dev, bus, &error_fatal); > + i2c_realize_and_unref(I2C_SLAVE(dev), bus, &error_fatal); > > return dev; > } > -- > 2.21.3 > >