[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH 02/17] hw/i2c: QOM'ify exynos4210_i2c.c
From: |
xiaoqiang zhao |
Subject: |
[Qemu-arm] [PATCH 02/17] hw/i2c: QOM'ify exynos4210_i2c.c |
Date: |
Tue, 7 Jun 2016 18:34:39 +0800 |
* 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>
---
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,
};
--
2.1.4
- [Qemu-arm] [PATCH 00/17] some ARM platform QOM'ify work, xiaoqiang zhao, 2016/06/07
- [Qemu-arm] [PATCH 05/17] hw/gpio: QOM'ify mpc8xxx.c, xiaoqiang zhao, 2016/06/07
- [Qemu-arm] [PATCH 06/17] hw/gpio: QOM'ify omap_gpio.c, xiaoqiang zhao, 2016/06/07
- [Qemu-arm] [PATCH 04/17] hw/i2c: QOM'ify versatile_i2c.c, xiaoqiang zhao, 2016/06/07
- [Qemu-arm] [PATCH 03/17] hw/i2c: QOM'ify omap_i2c.c, xiaoqiang zhao, 2016/06/07
- [Qemu-arm] [PATCH 01/17] hw/i2c: QOM'ify bitbang_i2c.c, xiaoqiang zhao, 2016/06/07
- [Qemu-arm] [PATCH 02/17] hw/i2c: QOM'ify exynos4210_i2c.c,
xiaoqiang zhao <=
- Re: [Qemu-arm] [Qemu-devel] [PATCH 00/17] some ARM platform QOM'ify work, Mark Cave-Ayland, 2016/06/07
- Re: [Qemu-arm] [PATCH 00/17] some ARM platform QOM'ify work, Peter Maydell, 2016/06/09