[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/14] hw/timmer: QOM'ify exynos4210_rtc
From: |
xiaoqiang zhao |
Subject: |
[Qemu-devel] [PATCH 05/14] hw/timmer: QOM'ify exynos4210_rtc |
Date: |
Tue, 26 Jan 2016 18:55:44 +0800 |
assign exynos4210_rtc_init to exynos4210_rtc_info.instance_init
and drop the SysBusDeviceClass::init
Signed-off-by: xiaoqiang zhao <address@hidden>
---
hw/timer/exynos4210_rtc.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/timer/exynos4210_rtc.c b/hw/timer/exynos4210_rtc.c
index bf2ee9f..cfd6d9d 100644
--- a/hw/timer/exynos4210_rtc.c
+++ b/hw/timer/exynos4210_rtc.c
@@ -546,9 +546,10 @@ static const MemoryRegionOps exynos4210_rtc_ops = {
/*
* RTC timer initialization
*/
-static int exynos4210_rtc_init(SysBusDevice *dev)
+static void exynos4210_rtc_init(Object *obj)
{
- Exynos4210RTCState *s = EXYNOS4210_RTC(dev);
+ Exynos4210RTCState *s = EXYNOS4210_RTC(obj);
+ SysBusDevice *dev = SYS_BUS_DEVICE(obj);
QEMUBH *bh;
bh = qemu_bh_new(exynos4210_rtc_tick, s);
@@ -566,16 +567,12 @@ static int exynos4210_rtc_init(SysBusDevice *dev)
memory_region_init_io(&s->iomem, OBJECT(s), &exynos4210_rtc_ops, s,
"exynos4210-rtc", EXYNOS4210_RTC_REG_MEM_SIZE);
sysbus_init_mmio(dev, &s->iomem);
-
- return 0;
}
static void exynos4210_rtc_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
- SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
- k->init = exynos4210_rtc_init;
dc->reset = exynos4210_rtc_reset;
dc->vmsd = &vmstate_exynos4210_rtc_state;
}
@@ -584,6 +581,7 @@ static const TypeInfo exynos4210_rtc_info = {
.name = TYPE_EXYNOS4210_RTC,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(Exynos4210RTCState),
+ .instance_init = exynos4210_rtc_init,
.class_init = exynos4210_rtc_class_init,
};
--
2.1.4
- [Qemu-devel] [PATCH 00/14] QOM'ify hw/timmer/*, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 08/14] hw/timmer: QOM'ify m48txx_sysbus, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 10/14] hw/timmer: QOM'ify pl031, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 02/14] hw/timmer: QOM'ify etraxfs_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 09/14] hw/timmer: QOM'ify milkymist_sysctl, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 04/14] hw/timmer: QOM'ify exynos4210_pwm, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 03/14] hw/timmer: QOM'ify exynos4210_mct, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 06/14] hw/timmer: QOM'ify grlib_gptimer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 01/14] hw/timmer: QOM'ify arm_timer, xiaoqiang zhao, 2016/01/26
- [Qemu-devel] [PATCH 05/14] hw/timmer: QOM'ify exynos4210_rtc,
xiaoqiang zhao <=
- [Qemu-devel] [PATCH 07/14] hw/timmer: QOM'ify lm32_timer, xiaoqiang zhao, 2016/01/26
- Re: [Qemu-devel] [PATCH 00/14] QOM'ify hw/timmer/*, Eric Blake, 2016/01/26