summaryrefslogtreecommitdiffstats
path: root/hw/arm/musicpal.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/musicpal.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/musicpal.c')
-rw-r--r--hw/arm/musicpal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index ff9a7c8cc6..c3b9780f35 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1584,7 +1584,7 @@ static void musicpal_init(MachineState *machine)
DeviceState *i2c_dev;
DeviceState *lcd_dev;
DeviceState *key_dev;
- DeviceState *wm8750_dev;
+ I2CSlave *wm8750_dev;
SysBusDevice *s;
I2CBus *i2c;
int i;
@@ -1687,7 +1687,7 @@ static void musicpal_init(MachineState *machine)
qdev_connect_gpio_out(key_dev, i, qdev_get_gpio_in(dev, i + 15));
}
- wm8750_dev = i2c_create_slave(i2c, TYPE_WM8750, MP_WM_ADDR);
+ wm8750_dev = i2c_slave_create_simple(i2c, TYPE_WM8750, MP_WM_ADDR);
dev = qdev_new(TYPE_MV88W8618_AUDIO);
s = SYS_BUS_DEVICE(dev);
object_property_set_link(OBJECT(dev), "wm8750", OBJECT(wm8750_dev),