[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 04/16] hw/timer: QOM'ify exynos4210_mct
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH v3 04/16] hw/timer: QOM'ify exynos4210_mct |
Date: |
Tue, 16 Feb 2016 19:09:36 +0800 |
assign exynos4210_mct_init to exynos4210_mct_info.instance_init
and drop the SysBusDeviceClass::init
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/exynos4210_mct.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index 73e547c..ae69345 100644
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -1422,10 +1422,11 @@ static const MemoryRegionOps exynos4210_mct_ops = {
};
/* MCT init */
-static int exynos4210_mct_init(SysBusDevice *dev)
+static void exynos4210_mct_init(Object *obj)
{
int i;
- Exynos4210MCTState *s = EXYNOS4210_MCT(dev);
+ Exynos4210MCTState *s = EXYNOS4210_MCT(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
QEMUBH *bh[2];
/* Global timer */
@@ -1450,19 +1451,15 @@ static int exynos4210_mct_init(SysBusDevice *dev)
sysbus_init_irq(dev, &s->l_timer[i].irq);
}
- memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_mct_ops, s,
+ memory_region_init_io(&s->iomem, obj, &exynos4210_mct_ops, s,
"exynos4210-mct", MCT_SFR_SIZE);
sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
}
static void exynos4210_mct_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = exynos4210_mct_init;
dc->reset = exynos4210_mct_reset;
dc->vmsd = &vmstate_exynos4210_mct_state;
}
@@ -1471,6 +1468,7 @@ static const TypeInfo exynos4210_mct_info = {
.name = TYPE_EXYNOS4210_MCT,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210MCTState),
+ .instance_init = exynos4210_mct_init,
.class_init = exynos4210_mct_class_init,
};
--
2.1.4
- [Qemu-devel] [PATCH v3 00/16] QOM'ify hw/timer/*, xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 03/16] hw/timer: QOM'ify etraxfs_timer, xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 07/16] hw/timer: QOM'ify grlib_gptimer, xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 02/16] hw/timer: QOM'ify arm_timer (pass 2), xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 01/16] hw/timer: QOM'ify arm_timer (pass 1), xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 05/16] hw/timer: QOM'ify exynos4210_pwm, xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 04/16] hw/timer: QOM'ify exynos4210_mct,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH v3 08/16] hw/timer: QOM'ify lm32_timer, xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 09/16] hw/timer: QOM'ify m48txx_sysbus (pass 1), xiaoqiang zhao, 2016/02/16
- [Qemu-devel] [PATCH v3 06/16] hw/timer: QOM'ify exynos4210_rtc, xiaoqiang zhao, 2016/02/16
- Re: [Qemu-devel] [PATCH v3 00/16] QOM'ify hw/timer/*, Peter Maydell, 2016/02/18