Message ID | 20181213145445.17935-22-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | f7c5f21eaa630e9ee41dd6aa9b9cb7a0ff54a12c |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp912784ljp; Thu, 13 Dec 2018 07:10:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/XA6uW6qdG2B1grODRti/bVV7t2z89O+sseCV/9tbi/9JZ9lVLwXsqBzWDm2J8gLaIe19qk X-Received: by 2002:a37:3293:: with SMTP id y141mr20789193qky.132.1544713810247; Thu, 13 Dec 2018 07:10:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544713810; cv=none; d=google.com; s=arc-20160816; b=QeM22K13LwWsvbJv3pnHYI2b+pWjSY3O8a9/yxJP7HixJf4ae9m8jj9dBXYw7zevSW nk07yHq8PpEsmYi3KkrWouBsOvlcAHfryITpFk8md9ZCxCZAbiMsGcboE8Cv81hvo1g8 EsqfRAfg08vLSOozurdZCnl07+uoeLwbDQHcBR4rMHZ5PewsE5uYbiT9PBmmbGY9lBsj vjDZP9QZnStK6gCrzvU/FJ7ZHIEwGgF9OjSEBcC6Ut50M2Yi4uoJyonkHr6nm06SfZWd y0TEKqvgQPK/efwqjiw0kFNQitPv2eWuWIhxSlK4IjkSG1pqsOv8SqmhfMJXJaK1H2FW VcgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=MB8qNLIwvFS8bThpYGmOJQ53W4bijM4iOsOA/4ZQnYw=; b=O/3aAihQ/n3M6RaOPY7+DaLwiHUdYNjbq85YP4Q0GZrdNHKL6t8BIKq+t14iVKXSH6 tdVKhUwHsCfaa3PQ7+OoTFcSqk/Gpc52bZS5XhBdQ2mLWYbmEb3bI3p5enLHANijppTc mt/sE0sDwgY/eS01V/eyj6a0dh+bBxLkk4AetnRT1QAAav8sKXF7Cg9J0D46z/nxFjUK 9tT8AJm6i3fxf8sijMoJBhDnMUpfkG8NSMH0Q4C/omkmVdmLTi47niOfDHod2fTg5xOc ojXEh6Z6MEaWhpNoSkwIzgj04GOCKrw8w/o7wfhM2S8VsXjQ5W1EfX7NygLhuDFDiHia RxDw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m43si1204790qvm.77.2018.12.13.07.10.10 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 07:10:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53157 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXScr-00014h-LK for patch@linaro.org; Thu, 13 Dec 2018 10:10:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSPP-0005Jb-3K for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSPG-0000Pz-60 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:13 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:53510) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSPF-000747-So for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:56:06 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gXSO9-0007KC-Am for qemu-devel@nongnu.org; Thu, 13 Dec 2018 14:54:57 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 14:54:29 +0000 Message-Id: <20181213145445.17935-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181213145445.17935-1-peter.maydell@linaro.org> References: <20181213145445.17935-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 21/37] usb/tusb6010: Convert sysbus init function to realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/usb/tusb6010.c b/hw/usb/tusb6010.c index a2128024c11..501706e2b29 100644 --- a/hw/usb/tusb6010.c +++ b/hw/usb/tusb6010.c @@ -808,10 +808,10 @@ static void tusb6010_reset(DeviceState *dev) musb_reset(s->musb); } -static int tusb6010_init(SysBusDevice *sbd) +static void tusb6010_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(sbd); TUSBState *s = TUSB(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); s->otg_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_otg_tick, s); s->pwr_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, tusb_power_tick, s); @@ -822,15 +822,13 @@ static int tusb6010_init(SysBusDevice *sbd) sysbus_init_irq(sbd, &s->irq); qdev_init_gpio_in(dev, tusb6010_irq, musb_irq_max + 1); s->musb = musb_init(dev, 1); - return 0; } static void tusb6010_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = tusb6010_init; + dc->realize = tusb6010_realize; dc->reset = tusb6010_reset; }