From patchwork Wed Feb 12 00:28:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 319442 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 70DE12C0098 for ; Wed, 12 Feb 2014 11:29:35 +1100 (EST) Received: from localhost ([::1]:36649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDNhk-0004Y2-NB for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 19:29:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDNhI-0004OY-Ni for qemu-devel@nongnu.org; Tue, 11 Feb 2014 19:29:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDNhC-0004US-I6 for qemu-devel@nongnu.org; Tue, 11 Feb 2014 19:29:04 -0500 Received: from mail-qa0-f48.google.com ([209.85.216.48]:48664) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDNhC-0004UM-DQ for qemu-devel@nongnu.org; Tue, 11 Feb 2014 19:28:58 -0500 Received: by mail-qa0-f48.google.com with SMTP id f11so12790253qae.7 for ; Tue, 11 Feb 2014 16:28:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UnSU+TQf9qdJiOe4khTqQPKtvvRR7NfXRCB2ZH+e91s=; b=A6CEo0vk0nOAuLkrXZ3doxkmTtanpBMZONa9mLFvl2sroMTeSeid7hjEjmi7oqDVes vgd5I/R+uavdXLxyLN7HLIuf2vsnwegcZrggkeOSluz9BZaGUsPFKiZLjbY54CCLb+rh hBRmNkdUMaLabs+sfOX+GmQwBL4H34NxOuwaWnMwAZl0x0zUFxigowQ+PhjUf61+luSr tFxvHd44o+wPL8WniZg3DKRVvTTLgMw7FYfJvoJP5pHedfjVP9QxLDcu8o99zATMmPAJ sP/kQSBDs5sWd5/yJevHyQFLeGnM1aL5wpf0H4ymeUiRm/Rr1Ylf9ouBsHh9cWV1Y77s 0C8A== X-Gm-Message-State: ALoCoQk0mhWMMfiMVYkK+m2OvnqFV2VwPPd+1QoMxB5kPV+acrx2yVMZHTzceUyvzv0y8zXRZBNR X-Received: by 10.229.118.4 with SMTP id t4mr32977681qcq.9.1392164938118; Tue, 11 Feb 2014 16:28:58 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id b14sm31233066qga.16.2014.02.11.16.28.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 16:28:57 -0800 (PST) From: Peter Crosthwaite To: afaerber@suse.de, qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 16:28:25 -0800 Message-Id: X-Mailer: git-send-email 1.8.5.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.216.48 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH qom-next v1 2/6] ssi: Remove legacy SSI_BUS->BUS cast 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove two legacy ->qbus style casts from TYPE_SSI_BUS to TYPE_BUS in ssi.c. Signed-off-by: Peter Crosthwaite --- hw/ssi/ssi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 2c25260..f2bdf30 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -88,7 +88,7 @@ static const TypeInfo ssi_slave_info = { DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name) { - return qdev_create(&bus->qbus, name); + return qdev_create(BUS(bus), name); } DeviceState *ssi_create_slave(SSIBus *bus, const char *name) @@ -156,7 +156,7 @@ static int ssi_auto_connect_slave(Object *child, void *opaque) } cs_line = qdev_get_gpio_in(DEVICE(dev), 0); - qdev_set_parent_bus(DEVICE(dev), &arg->bus->qbus); + qdev_set_parent_bus(DEVICE(dev), BUS(arg->bus)); **arg->cs_linep = cs_line; (*arg->cs_linep)++; return 0;