summary refs log tree commit diff stats
path: root/hw/arm/z2.c
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2020-07-06 00:41:53 +0200
committerCorey Minyard <cminyard@mvista.com>2020-07-16 12:30:54 -0500
commit1373b15bb55e46b067f84f70c60d3d03af62fd62 (patch)
treec183ff98c64c9a4c46d694128b75b5b9e378296f /hw/arm/z2.c
parent2616f57231c8e065df77de894a8f018cd1842c95 (diff)
downloadfocaccia-qemu-1373b15bb55e46b067f84f70c60d3d03af62fd62.tar.gz
focaccia-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/z2.c')
-rw-r--r--hw/arm/z2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index e1f22f5868..9a9bbc653b 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -330,8 +330,8 @@ static void z2_init(MachineState *machine)
     type_register_static(&aer915_info);
     z2_lcd = ssi_create_slave(mpu->ssp[1], TYPE_ZIPIT_LCD);
     bus = pxa2xx_i2c_bus(mpu->i2c[0]);
-    i2c_create_slave(bus, TYPE_AER915, 0x55);
-    wm = i2c_create_slave(bus, TYPE_WM8750, 0x1b);
+    i2c_slave_create_simple(bus, TYPE_AER915, 0x55);
+    wm = DEVICE(i2c_slave_create_simple(bus, TYPE_WM8750, 0x1b));
     mpu->i2s->opaque = wm;
     mpu->i2s->codec_out = wm8750_dac_dat;
     mpu->i2s->codec_in = wm8750_adc_dat;