mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
hw/i2c: Rename i2c_try_create_slave() as i2c_slave_new()
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. Suggested-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20200705224154.16917-3-f4bug@amsat.org> Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
parent
7a204cbdc2
commit
db437ca6df
3 changed files with 8 additions and 9 deletions
|
@ -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,12 +283,11 @@ 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;
|
||||
I2CSlave *dev = i2c_slave_new(name, addr);
|
||||
|
||||
dev = i2c_try_create_slave(name, addr);
|
||||
i2c_realize_and_unref(dev, bus, &error_fatal);
|
||||
i2c_realize_and_unref(DEVICE(dev), bus, &error_fatal);
|
||||
|
||||
return dev;
|
||||
return DEVICE(dev);
|
||||
}
|
||||
|
||||
static void i2c_slave_class_init(ObjectClass *klass, void *data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue