From patchwork Mon Jun 13 10:32:03 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: 9172593 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 3CB4760573 for ; Mon, 13 Jun 2016 10:34:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E9531FFC7 for ; Mon, 13 Jun 2016 10:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2379F22230; Mon, 13 Jun 2016 10:34:00 +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 0A93B27BC3 for ; Mon, 13 Jun 2016 10:33:58 +0000 (UTC) Received: from localhost ([::1]:55109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPBt-0001V0-4V for patchwork-qemu-devel@patchwork.kernel.org; Mon, 13 Jun 2016 06:33:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPB5-00017x-FQ for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:33:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCPAx-00053z-0o for qemu-devel@nongnu.org; Mon, 13 Jun 2016 06:33:06 -0400 Received: from m12-17.163.com ([220.181.12.17]:35246) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCPAv-000524-7o; Mon, 13 Jun 2016 06:32:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=RO86TxpynSTC7clDlZ V6GtRzGMw7NlEiupNTNHyE5dA=; b=NuIB7IZpb/mZzCzrgUOIIqrdcSv+ZEh3am VGnLoQtfmCpcmPFL2hT2MxEo617Aj5p0o4mdIoBmEg/fFxBi9bnT4AaxAiGoOipg H6enGsiT5QM3tFzE0XVoC9QHOJwmjyXQYxTw4AhIcXko/wyyU/oH4oTkdVklnv+R TTN0D0G4c= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp13 (Coremail) with SMTP id EcCowADHYci3i15XduskAw--.9790S6; Mon, 13 Jun 2016 18:32:28 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Mon, 13 Jun 2016 18:32:03 +0800 Message-Id: <1465813931-20534-5-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465813931-20534-1-git-send-email-zxq_yx_007@163.com> References: <1465813931-20534-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EcCowADHYci3i15XduskAw--.9790S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47AF1rZF1kCw43tF48Xrb_yoW8WF1fpr 93WF9xWFW7Grs7Wry7tFs8WF1rCas7GF4rtr4xXF10y3Z8uw1FvrnrG3yrCayDKay093WY qrW8CFy7AF47Gw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jDTmhUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiqByHxlc64UJzswAAs7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.17 Subject: [Qemu-devel] [PATCH 04/12] hw/i2c: QOM'ify versatile_i2c.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/i2c/versatile_i2c.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c index 0bce524..da9f298 100644 --- a/hw/i2c/versatile_i2c.c +++ b/hw/i2c/versatile_i2c.c @@ -79,32 +79,25 @@ static const MemoryRegionOps versatile_i2c_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int versatile_i2c_init(SysBusDevice *sbd) +static void versatile_i2c_init(Object *obj) { - DeviceState *dev = DEVICE(sbd); - VersatileI2CState *s = VERSATILE_I2C(dev); + DeviceState *dev = DEVICE(obj); + VersatileI2CState *s = VERSATILE_I2C(obj); + SysBusDevice *sbd = SYS_BUS_DEVICE(obj); I2CBus *bus; bus = i2c_init_bus(dev, "i2c"); s->bitbang = bitbang_i2c_init(bus); - memory_region_init_io(&s->iomem, OBJECT(s), &versatile_i2c_ops, s, + memory_region_init_io(&s->iomem, obj, &versatile_i2c_ops, s, "versatile_i2c", 0x1000); sysbus_init_mmio(sbd, &s->iomem); - return 0; -} - -static void versatile_i2c_class_init(ObjectClass *klass, void *data) -{ - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - - k->init = versatile_i2c_init; } static const TypeInfo versatile_i2c_info = { .name = TYPE_VERSATILE_I2C, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(VersatileI2CState), - .class_init = versatile_i2c_class_init, + .instance_init = versatile_i2c_init, }; static void versatile_i2c_register_types(void)