summaryrefslogtreecommitdiffstats
path: root/hw/arm/pxa2xx.c
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-07-06 00:41:53 +0200
committerCorey Minyard2020-07-16 19:30:54 +0200
commit1373b15bb55e46b067f84f70c60d3d03af62fd62 (patch)
treec183ff98c64c9a4c46d694128b75b5b9e378296f /hw/arm/pxa2xx.c
parenthw/i2c: Rename i2c_realize_and_unref() as i2c_slave_realize_and_unref() (diff)
downloadqemu-1373b15bb55e46b067f84f70c60d3d03af62fd62.tar.gz
qemu-1373b15bb55e46b067f84f70c60d3d03af62fd62.tar.xz
qemu-1373b15bb55e46b067f84f70c60d3d03af62fd62.zip
hw/i2c: Rename i2c_create_slave() as i2c_slave_create_simple()
We use "create_simple" names for functions that allocate, initialize, configure and realize device objects: pci_create_simple(), isa_create_simple(), usb_create_simple(). For consistency, rename i2c_create_slave() as i2c_slave_create_simple(). Since we have to update all the callers, also let it return a I2CSlave object. Suggested-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Corey Minyard <cminyard@mvista.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20200705224154.16917-5-f4bug@amsat.org> Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'hw/arm/pxa2xx.c')
-rw-r--r--hw/arm/pxa2xx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index f104a33463..6203c4cfe0 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -1522,8 +1522,9 @@ PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base,
s = PXA2XX_I2C(i2c_dev);
/* FIXME: Should the slave device really be on a separate bus? */
i2cbus = i2c_init_bus(dev, "dummy");
- dev = i2c_create_slave(i2cbus, TYPE_PXA2XX_I2C_SLAVE, 0);
- s->slave = PXA2XX_I2C_SLAVE(dev);
+ s->slave = PXA2XX_I2C_SLAVE(i2c_slave_create_simple(i2cbus,
+ TYPE_PXA2XX_I2C_SLAVE,
+ 0));
s->slave->host = s;
return s;