[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/30] hw/i2c: QOM'ify exynos4210_i2c.c
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 10/30] hw/i2c: QOM'ify exynos4210_i2c.c |
Date: |
Tue, 14 Jun 2016 15:13:45 +0100 |
From: xiaoqiang zhao <address@hidden>
* Rename the exynos4210_i2c_realize to exynos4210_i2c_init
* Drop the old SysBus init function and use instance_init
Signed-off-by: xiaoqiang zhao <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/i2c/exynos4210_i2c.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/hw/i2c/exynos4210_i2c.c b/hw/i2c/exynos4210_i2c.c
index 8c2a2c1..c96fa7d 100644
--- a/hw/i2c/exynos4210_i2c.c
+++ b/hw/i2c/exynos4210_i2c.c
@@ -299,33 +299,32 @@ static void exynos4210_i2c_reset(DeviceState *d)
s->scl_free = true;
}
-static int exynos4210_i2c_realize(SysBusDevice *sbd)
+static void exynos4210_i2c_init(Object *obj)
{
- DeviceState *dev = DEVICE(sbd);
- Exynos4210I2CState *s = EXYNOS4_I2C(dev);
+ DeviceState *dev = DEVICE(obj);
+ Exynos4210I2CState *s = EXYNOS4_I2C(obj);
+ SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
- memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_i2c_ops, s,
+ memory_region_init_io(&s->iomem, obj, &exynos4210_i2c_ops, s,
TYPE_EXYNOS4_I2C, EXYNOS4_I2C_MEM_SIZE);
sysbus_init_mmio(sbd, &s->iomem);
sysbus_init_irq(sbd, &s->irq);
s->bus = i2c_init_bus(dev, "i2c");
- return 0;
}
static void exynos4210_i2c_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *sbdc = SYS_BUS_DEVICE_CLASS(klass);
dc->vmsd = &exynos4210_i2c_vmstate;
dc->reset = exynos4210_i2c_reset;
- sbdc->init = exynos4210_i2c_realize;
}
static const TypeInfo exynos4210_i2c_type_info = {
.name = TYPE_EXYNOS4_I2C,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210I2CState),
+ .instance_init = exynos4210_i2c_init,
.class_init = exynos4210_i2c_class_init,
};
--
1.9.1
- [Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code, (continued)
- [Qemu-devel] [PULL 05/30] hw/arm/virt: separate versioned type-init code, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 01/30] target-arm: kvm64: set guest PMUv3 feature bit if supported, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 12/30] hw/i2c: QOM'ify versatile_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 13/30] hw/gpio: QOM'ify omap_gpio.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 06/30] hw/arm/virt: introduce DEFINE_VIRT_MACHINE, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 14/30] hw/gpio: QOM'ify pl061.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 16/30] hw/misc: QOM'ify arm_l2x0.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 02/30] hw/arm/virt: Add PMU node for virt machine, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 15/30] hw/gpio: QOM'ify zaurus.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 08/30] hw/arm/virt: create the 2.7 machine type, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 10/30] hw/i2c: QOM'ify exynos4210_i2c.c,
Peter Maydell <=
- [Qemu-devel] [PULL 11/30] hw/i2c: QOM'ify omap_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 09/30] hw/i2c: QOM'ify bitbang_i2c.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 18/30] hw/misc: QOM'ify mst_fpga.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 17/30] hw/misc: QOM'ify exynos4210_pmu.c, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 23/30] i2c: Factor our send() and recv() common logic, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 22/30] i2c: implement broadcast write, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 29/30] arm: xlnx-zynqmp: Add xlnx-dp and xlnx-dpdma, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 30/30] target-arm: Don't permit ARMv8-only Neon insns on ARMv7, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 21/30] i2cbus: remove unused dev field, Peter Maydell, 2016/06/14
- [Qemu-devel] [PULL 20/30] hw/sd: QOM'ify pl181.c, Peter Maydell, 2016/06/14