From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO1Ja-00071V-JV for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:57:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO1JX-0003Ib-NP for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:57:38 -0500 Received: from m12-13.163.com ([220.181.12.13]:38820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO1JX-0003Gp-5v for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:57:35 -0500 From: xiaoqiang zhao Date: Tue, 26 Jan 2016 18:55:42 +0800 Message-Id: <1453805753-27564-4-git-send-email-zxq_yx_007@163.com> In-Reply-To: <1453805753-27564-1-git-send-email-zxq_yx_007@163.com> References: <1453805753-27564-1-git-send-email-zxq_yx_007@163.com> Subject: [Qemu-devel] [PATCH 03/14] hw/timmer: QOM'ify exynos4210_mct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xiaoqiang zhao , peter.maydell@linaro.org, afaerber@suse.de assign exynos4210_mct_init to exynos4210_mct_info.instance_init and drop the SysBusDeviceClass::init Signed-off-by: xiaoqiang zhao --- hw/timer/exynos4210_mct.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index 015bbaf..ed388ca 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -1421,10 +1421,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 */ @@ -1452,16 +1453,12 @@ static int exynos4210_mct_init(SysBusDevice *dev) memory_region_init_io(&s->iomem, OBJECT(s), &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; } @@ -1470,6 +1467,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