From patchwork Wed Jan 27 02:54:36 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: 8128681 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A9D689F9E8 for ; Wed, 27 Jan 2016 02:57:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 108342028D for ; Wed, 27 Jan 2016 02:57:23 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 70D6020279 for ; Wed, 27 Jan 2016 02:57:22 +0000 (UTC) Received: from localhost ([::1]:47896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOGIL-0007hH-W7 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 21:57:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOGI8-0007bY-SF for qemu-devel@nongnu.org; Tue, 26 Jan 2016 21:57:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOGI7-000651-TH for qemu-devel@nongnu.org; Tue, 26 Jan 2016 21:57:08 -0500 Received: from m12-18.163.com ([220.181.12.18]:39423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOGI7-00064Z-B4 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 21:57:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=AxWWXkzEYqtRdnzTEG 3qfrMQIKQ4hJdxSnxvAChJz68=; b=Iw6GMPCOwbUH7sA1ka9aNZ0S9lTekXEaG1 Mfa+9O5TnI4t5xNnzeCDzEU7+naczjFC1coNBegR6OP5UtLBKX25thkxj5K5oohe 4jp2czqcCqQqTD5wy5D93hRyiv9XoFtKpE/m87phKp72oCI71qUsZONfwqIVvlyS DGhRDCkwU= Received: from localhost.localdomain (unknown [118.187.28.42]) by smtp14 (Coremail) with SMTP id EsCowECZxFTKMahWzrGhAA--.213S4; Wed, 27 Jan 2016 10:56:41 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Wed, 27 Jan 2016 10:54:36 +0800 Message-Id: <1453863283-7562-3-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453863283-7562-1-git-send-email-zxq_yx_007@163.com> References: <1453863283-7562-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EsCowECZxFTKMahWzrGhAA--.213S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7AF4UtryUuFy8CFWfCF43Awb_yoW8XFyUp3 92kFsrCF4vqFs8Jrs7KFn7WF1rJF97CryrKw18Jw40yw1fAFWDXFn8J3yUGF47JFZ5uFW3 ZrWFyFy3Aa1jyr7anT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07U3rcfUUUUU= X-Originating-IP: [118.187.28.42] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiEAn8xlWBTb+4wwAAs+ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.18 Cc: xiaoqiang zhao , peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 02/14] hw/timer: QOM'ify etraxfs_timer 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP assign etraxfs_timer_init to etraxfs_timer_info.instance_init and drop the SysBusDeviceClass::init Signed-off-by: xiaoqiang zhao --- hw/timer/etraxfs_timer.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index aee4990..a3a6798 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -314,9 +314,10 @@ static void etraxfs_timer_reset(void *opaque) qemu_irq_lower(t->irq); } -static int etraxfs_timer_init(SysBusDevice *dev) +static void etraxfs_timer_init(Object *obj) { - ETRAXTimerState *t = ETRAX_TIMER(dev); + ETRAXTimerState *t = ETRAX_TIMER(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); t->bh_t0 = qemu_bh_new(timer0_hit, t); t->bh_t1 = qemu_bh_new(timer1_hit, t); @@ -332,20 +333,18 @@ static int etraxfs_timer_init(SysBusDevice *dev) "etraxfs-timer", 0x5c); sysbus_init_mmio(dev, &t->mmio); qemu_register_reset(etraxfs_timer_reset, t); - return 0; } static void etraxfs_timer_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); - - sdc->init = etraxfs_timer_init; + /* do nothing */ } static const TypeInfo etraxfs_timer_info = { .name = TYPE_ETRAX_FS_TIMER, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(ETRAXTimerState), + .instance_init = etraxfs_timer_init, .class_init = etraxfs_timer_class_init, };