From patchwork Mon Jun 13 10:54:12 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: 9172695 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0A3E060573 for ; Mon, 13 Jun 2016 11:05:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEB6E1FFC7 for ; Mon, 13 Jun 2016 11:05:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E370227C0C; Mon, 13 Jun 2016 11:05:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4394320855 for ; Mon, 13 Jun 2016 11:05:07 +0000 (UTC) Received: from localhost ([::1]:55329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPg2-00044b-9Z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 07:05:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPWp-0004WF-B2 for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:55:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCPWh-0003J9-Oa for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:55:35 -0400 Received: from m50-134.163.com ([123.125.50.134]:48169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPWg-0003Hi-Oh; Mon, 13 Jun 2016 06:55:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=x17t2WrVh8fSlGXjYS YIUDDSxAaymV7uXwjZe3io21A=; b=n4++BfKcgJ9ZfA67b/rR2m7zg2pq0VfFzO I9CXX2IHzWdO121mwT/+roZD4Ixadu673kCt+JhQwaWSWxE9XsycEShmhWJDKzH3 NVWi7Ht+kU4ZnyaMg7yFH9lyoIfOEp9nElXqhLKwaimYeBHsHUSjT/Jf5bI/nRP6 +2J5+C34o= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp4 (Coremail) with SMTP id DtGowABHnZnpkF5XcVHjBA--.36675S5; Mon, 13 Jun 2016 18:54:35 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 18:54:12 +0800 Message-Id: <1465815255-21776-10-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465815255-21776-1-git-send-email-zxq_yx_007@163.com> References: <1465815255-21776-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DtGowABHnZnpkF5XcVHjBA--.36675S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47GFW8GryrJw1UCFWDCFg_yoW8ArWrpr Z7CF1kJw13JrWkJa92yr1kGF1DA3Z5CrsF9rZ3Cr1xJF13KFyIq3WkGay5ta4DArZ5ZF13 Ar4Iyr9xA3WUA3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jlhFxUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqA6Hxlc64UK5DwAAsf X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.134 Subject: [Qemu-devel] [RESEND PATCH 09/12] hw/misc: QOM'ify exynos4210_pmu.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: i.mitsyanko@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, zhaoshenglong@huawei.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao --- hw/misc/exynos4210_pmu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c index 889abad..e30dbc7 100644 --- a/hw/misc/exynos4210_pmu.c +++ b/hw/misc/exynos4210_pmu.c @@ -457,15 +457,15 @@ static void exynos4210_pmu_reset(DeviceState *dev) } } -static int exynos4210_pmu_init(SysBusDevice *dev) +static void exynos4210_pmu_init(Object *obj) { - Exynos4210PmuState *s = EXYNOS4210_PMU(dev); + Exynos4210PmuState *s = EXYNOS4210_PMU(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); /* memory mapping */ - memory_region_init_io(&s->iomem, OBJECT(dev), &exynos4210_pmu_ops, s, + memory_region_init_io(&s->iomem, obj, &exynos4210_pmu_ops, s, "exynos4210.pmu", EXYNOS4210_PMU_REGS_MEM_SIZE); sysbus_init_mmio(dev, &s->iomem); - return 0; } static const VMStateDescription exynos4210_pmu_vmstate = { @@ -481,9 +481,7 @@ static const VMStateDescription exynos4210_pmu_vmstate = { static void exynos4210_pmu_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = exynos4210_pmu_init; dc->reset = exynos4210_pmu_reset; dc->vmsd = &exynos4210_pmu_vmstate; } @@ -492,6 +490,7 @@ static const TypeInfo exynos4210_pmu_info = { .name = TYPE_EXYNOS4210_PMU, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(Exynos4210PmuState), + .instance_init = exynos4210_pmu_init, .class_init = exynos4210_pmu_class_init, };