Message ID | 20181213145445.17935-4-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 7f7420a09ffe2e89c7de0aec41b1953adcc254ca |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp897304ljp; Thu, 13 Dec 2018 06:57:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/VzuF6XUOqG4iv8KxoOX4t7Utrd4YR4lvEIOA4F+z4YqowEhGkqLwdmk11U+qb65PTxCPxI X-Received: by 2002:aed:31c5:: with SMTP id 63mr24096024qth.385.1544713071764; Thu, 13 Dec 2018 06:57:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544713071; cv=none; d=google.com; s=arc-20160816; b=c/Mf8qyRbH/zN2DE5D2kLtsgquFFWx3+sb1DG39jeOgyzkvh93a92D3sDR4V631t3Z RrkHEsMQpQA/vO0hNhD+Wl34fBnHo1CbbR7j5xjaFFsk+8OyAEd6D/d37GWTuy1ES5y4 GwJLeGOOBx3+eUCGySMMw405PO9vHAWtP2Pcn6mw4Zr71fUM/bYh3upqubs2PKrQ4Z+t zt6/DRTAYcPah8cQzQE+lLfyzTZYHqU/OcvLHZQnVgFNr1VDTjARV4gH5oumk4LWoGTK 85Rsblr5k9lNeW9dXv4ehEaaReg6VCG/wucBWnoQsYxEXJu5M1lyOXmSMT9daqzuhprJ +xLw== 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=Sa5oV+DijJqvuUzWOtVP0mS/qwJwTdnzGz0BqmnDaPY=; b=S7KGX6EFijhavAaAq8nw944n5cY46vs/EYbOBaDFLlviL7QLNnx9R55+E2UpSzobXP KgJocFZqNRUwaByNexqoGk6VduR3rhTLJvWKhHv2HXBudS9pSWWl0lFJBcRgs8n3/hd0 SVI4xVPj+/CqdtjS7/G9TiQp4qgJRZSZKozZqJLWaJX4ZpRi0thnFGOWWjnN+b+15CtP rT4fTamyCy9Mn6xiDKrBe37QC4EdAFVXvtLyYJT4+McdoKhqGfIwUL+UuFQB8t8yn5MM b7prO4pFv+MO7+P9fO0sJTl8KJnlrxvUESTBFV+qjQzH5qdnBJizUnMhsYr8eZZgaoH2 zEHQ== 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 14si1229964qka.176.2018.12.13.06.57.51 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 13 Dec 2018 06:57:51 -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]:53082 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gXSQx-0006P8-68 for patch@linaro.org; Thu, 13 Dec 2018 09:57:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSO2-0003vD-98 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:54:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSO1-0006zK-4c for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:54:50 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:53504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gXSO0-0006w2-TY for qemu-devel@nongnu.org; Thu, 13 Dec 2018 09:54:49 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gXSNz-0007Fd-Eo for qemu-devel@nongnu.org; Thu, 13 Dec 2018 14:54:47 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 14:54:11 +0000 Message-Id: <20181213145445.17935-4-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-Type: text/plain; charset=UTF-8 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 03/37] musicpal: 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/arm/musicpal.c b/hw/arm/musicpal.c index 726ae29394e..d22532a11c8 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1147,14 +1147,13 @@ static const MemoryRegionOps mv88w8618_wlan_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int mv88w8618_wlan_init(SysBusDevice *dev) +static void mv88w8618_wlan_realize(DeviceState *dev, Error **errp) { MemoryRegion *iomem = g_new(MemoryRegion, 1); memory_region_init_io(iomem, OBJECT(dev), &mv88w8618_wlan_ops, NULL, "musicpal-wlan", MP_WLAN_SIZE); - sysbus_init_mmio(dev, iomem); - return 0; + sysbus_init_mmio(SYS_BUS_DEVICE(dev), iomem); } /* GPIO register offsets */ @@ -1720,9 +1719,9 @@ DEFINE_MACHINE("musicpal", musicpal_machine_init) static void mv88w8618_wlan_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); + DeviceClass *dc = DEVICE_CLASS(klass); - sdc->init = mv88w8618_wlan_init; + dc->realize = mv88w8618_wlan_realize; } static const TypeInfo mv88w8618_wlan_info = {