From patchwork Tue Jan 26 10:55:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 573319 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 768011402A9 for ; Wed, 27 Jan 2016 01:22:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=oHN93nDx; dkim-atps=neutral Received: from localhost ([::1]:44314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO4WF-0005ux-Ff for incoming@patchwork.ozlabs.org; Tue, 26 Jan 2016 09:22:55 -0500 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=JCuZkUyh4PwIDpPua0 ZoS6Ub+NgQHXn76KCtuStPW6w=; b=oHN93nDxc5m2pRtnH6tZECrCv9bflcc8zb g/IxMpnmIr/P0Vtoi1hwPKUxCIYYp91aADKcAiD+wznDZtuhcWvY2e18bA/Yahe6 CCASzSdBhbOBXoRYagJuTmN41OmfP3du1IX8o50as/Bqh557NzA9uaQ/w4u/wyHp DErdBRDDs= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp9 (Coremail) with SMTP id DcCowACHxebqUKdWJttrAA--.26091S5; Tue, 26 Jan 2016 18:57:04 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 18:55:42 +0800 Message-Id: <1453805753-27564-4-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 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> X-CM-TRANSID: DcCowACHxebqUKdWJttrAA--.26091S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar47XrykJrW7XrW7Ar18Xwb_yoW8Ww13pF ZruF17A3yfJrZ7AF4IyF1DW3WDC3Z5Crs2qrn3Cry8Aw12gr9Fy3WkAay7Aa18JrZ5AF15 AFy8Jr15CF1UJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UqPfdUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEAD7xlUL6eSruAAAst X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 X-Mailman-Approved-At: Tue, 26 Jan 2016 09:22:12 -0500 Cc: xiaoqiang zhao , peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH 03/14] hw/timmer: QOM'ify exynos4210_mct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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, };