From patchwork Thu Mar 24 10:29:28 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: 8659421 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 13F859F36E for ; Thu, 24 Mar 2016 10:32:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8BE6620376 for ; Thu, 24 Mar 2016 10:32:20 +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 AD4142026D for ; Thu, 24 Mar 2016 10:32:19 +0000 (UTC) Received: from localhost ([::1]:49039 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj2Ys-0007x9-TP for patchwork-qemu-devel@patchwork.kernel.org; Thu, 24 Mar 2016 06:32:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48160) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj2Yh-0007ww-Pz for qemu-devel@nongnu.org; Thu, 24 Mar 2016 06:32:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aj2Yc-0005bu-MK for qemu-devel@nongnu.org; Thu, 24 Mar 2016 06:32:07 -0400 Received: from m12-16.163.com ([220.181.12.16]:34288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aj2Yb-0005W5-O2; Thu, 24 Mar 2016 06:32:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=+/YR34tmpMZA7lAYbX oFAeOTch4Z36ZKrV2KLVJ+BnQ=; b=k8g+MWNycvbVBMqrJy7jM7Un8grbBlTDlx w6Wrh8od2MGYIP4M1SvFCA5qzFuSGQj6F1/zE+E/w/ewN0gpkN9DByh4+9O/8unT 3GMo8Uq9v79yPFlUAc2irm8gbYRKQzy/tt6OzlJRAdg+2fu4R9b96u9pq9nq1isj HekTnwUZ0= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp12 (Coremail) with SMTP id EMCowEDpR1DcwfNWAMmNAA--.623S5; Thu, 24 Mar 2016 18:31:03 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 24 Mar 2016 18:29:28 +0800 Message-Id: <1458815374-22279-4-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458815374-22279-1-git-send-email-zxq_yx_007@163.com> References: <1458815374-22279-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EMCowEDpR1DcwfNWAMmNAA--.623S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7uw45Jw1UZw1rAFy5WrWrAFb_yoW8XrW7pr n3AF48Cw45tFs5JrWftF4DW3WkJ3Z2kF1xGrsrGwna9w43GryDKF1UAw45uay5KFW0yF13 Xa4xG3yxAr1jvw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j-a93UUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEgc2xlZXwzSq9AAAsN X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.16 Cc: i.mitsyanko@gmail.com, peter.maydell@linaro.org, michael@walle.cc, qemu-arm@nongnu.org, hirofumi@mail.parknet.co.jp Subject: [Qemu-devel] [PATCH 3/6] hw/display/jazz_led.c 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 --- hw/display/jazz_led.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/display/jazz_led.c b/hw/display/jazz_led.c index 09dcdb4..e0a079a 100644 --- a/hw/display/jazz_led.c +++ b/hw/display/jazz_led.c @@ -267,16 +267,15 @@ static const GraphicHwOps jazz_led_ops = { .text_update = jazz_led_text_update, }; -static int jazz_led_init(SysBusDevice *dev) +static void jazz_led_init(Object *obj) { - LedState *s = JAZZ_LED(dev); + LedState *s = JAZZ_LED(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); - memory_region_init_io(&s->iomem, OBJECT(s), &led_ops, s, "led", 1); + memory_region_init_io(&s->iomem, obj, &led_ops, s, "led", 1); sysbus_init_mmio(dev, &s->iomem); s->con = graphic_console_init(DEVICE(dev), 0, &jazz_led_ops, s); - - return 0; } static void jazz_led_reset(DeviceState *d) @@ -291,9 +290,7 @@ static void jazz_led_reset(DeviceState *d) static void jazz_led_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = jazz_led_init; dc->desc = "Jazz LED display", dc->vmsd = &vmstate_jazz_led; dc->reset = jazz_led_reset; @@ -303,6 +300,7 @@ static const TypeInfo jazz_led_info = { .name = TYPE_JAZZ_LED, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(LedState), + .instance_init = jazz_led_init, .class_init = jazz_led_class_init, };