From patchwork Mon Jun 13 10:54:13 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: 9172705 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 6C3FB60573 for ; Mon, 13 Jun 2016 11:15:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E7092015F for ; Mon, 13 Jun 2016 11:15:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51B5D26861; Mon, 13 Jun 2016 11:15:25 +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 CFA8E2015F for ; Mon, 13 Jun 2016 11:15:24 +0000 (UTC) Received: from localhost ([::1]:55402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPpz-0005H9-QH for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 07:15:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPWp-0004W1-3h for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:55:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCPWh-0003J0-MK for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:55:35 -0400 Received: from m50-134.163.com ([123.125.50.134]:48168) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPWg-0003Hg-MQ; 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=8sIYql+ZyGEkIAhM5K eeaLbRraOtCzapdKNoLeEakKo=; b=iRoX0MrlQucTfCySQkQtE5YmhByLwBhLTT +OtXRAO1AeRWSZhtDB48q0MPCL8mZ/qFNjwKfARt5EeDBFhxTUleXz0nIYwmXwpf 7hLEzfB8BehnUVpLtBd44tEU21onNn39MnDpbO0K24t/PEhAT9U4KarUzstjfajI zL3YL8vfM= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp4 (Coremail) with SMTP id DtGowABHnZnpkF5XcVHjBA--.36675S6; Mon, 13 Jun 2016 18:54:35 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 18:54:13 +0800 Message-Id: <1465815255-21776-11-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--.36675S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47uF17Xr4DCFW5uF18Grg_yoW8CFWUpF 93Z3WDur4rXrsFqrWfXrn8WF48Kws7Gws5tr10yws3ua4xGFWFq3Z2k3y2yrWUArWkXF4Y 9F18WFyftayUCw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jqLvtUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiTA6HxlSIPnTM3gAAsH X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.134 Subject: [Qemu-devel] [RESEND PATCH 10/12] hw/misc: QOM'ify mst_fpga.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/mst_fpga.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/misc/mst_fpga.c b/hw/misc/mst_fpga.c index 48d7dfb..a10f049 100644 --- a/hw/misc/mst_fpga.c +++ b/hw/misc/mst_fpga.c @@ -200,10 +200,11 @@ static int mst_fpga_post_load(void *opaque, int version_id) return 0; } -static int mst_fpga_init(SysBusDevice *sbd) +static void mst_fpga_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - mst_irq_state *s = MAINSTONE_FPGA(dev); + DeviceState *dev = DEVICE(obj); + mst_irq_state *s = MAINSTONE_FPGA(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); s->pcmcia0 = MST_PCMCIAx_READY | MST_PCMCIAx_nCD; s->pcmcia1 = MST_PCMCIAx_READY | MST_PCMCIAx_nCD; @@ -213,10 +214,9 @@ static int mst_fpga_init(SysBusDevice *sbd) /* alloc the external 16 irqs */ qdev_init_gpio_in(dev, mst_fpga_set_irq, MST_NUM_IRQS); - memory_region_init_io(&s->iomem, OBJECT(s), &mst_fpga_ops, s, + memory_region_init_io(&s->iomem, obj, &mst_fpga_ops, s, "fpga", 0x00100000); sysbus_init_mmio(sbd, &s->iomem); - return 0; } static VMStateDescription vmstate_mst_fpga_regs = { @@ -245,9 +245,7 @@ static VMStateDescription vmstate_mst_fpga_regs = { static void mst_fpga_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = mst_fpga_init; dc->desc = "Mainstone II FPGA"; dc->vmsd = &vmstate_mst_fpga_regs; } @@ -256,6 +254,7 @@ static const TypeInfo mst_fpga_info = { .name = TYPE_MAINSTONE_FPGA, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(mst_irq_state), + .instance_init = mst_fpga_init, .class_init = mst_fpga_class_init, };