From patchwork Mon Mar 4 05:04:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 224587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 829E82C030A for ; Mon, 4 Mar 2013 16:07:57 +1100 (EST) Received: from localhost ([::1]:60579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCNcx-0004Lq-KL for incoming@patchwork.ozlabs.org; Mon, 04 Mar 2013 00:07:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCNcZ-0004F2-Dj for qemu-devel@nongnu.org; Mon, 04 Mar 2013 00:07:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UCNcU-0000DQ-K6 for qemu-devel@nongnu.org; Mon, 04 Mar 2013 00:07:31 -0500 Received: from mail-pb0-f42.google.com ([209.85.160.42]:61403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UCNcU-0000DJ-EY for qemu-devel@nongnu.org; Mon, 04 Mar 2013 00:07:26 -0500 Received: by mail-pb0-f42.google.com with SMTP id xb4so2850773pbc.15 for ; Sun, 03 Mar 2013 21:07:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:x-gm-message-state; bh=yIqwr/J2Lk3GEQqhfpX11QaSznyeglcJ+qW+tolkjEQ=; b=eHE4knHMHO57VNUR82qfxmTW2AB6NbgKfzwRwTfEMBAo8BNdBbwKvlqA9bHBoZDtbW ArCd79PcudRfDzmesp4HFi9QNtjc6Wi3pN/ty9fxfr/VVnCfW+YYTJ/qMdS7H/QC8Th4 s8GaGVbILzlVgjB6FFROXFsnUUq+NYpPkuF+WgjMt2KrPot9oad0uSlvvadYVg8/NkC4 z8+Vz3HclB0etg6uvLIA0X2N8/KOeGQBc07guy5SsndhrcEIps6zVKVBvU/NCjg935zI NntfhcZ9Gb/eaQWemIcHLa1ejXIaTn2gSYGDq80uTiHGTocKF1RfS163jsSxb2Lh0b8l dJGQ== X-Received: by 10.66.240.100 with SMTP id vz4mr25269766pac.131.1362373645790; Sun, 03 Mar 2013 21:07:25 -0800 (PST) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id iv3sm20926160pbc.40.2013.03.03.21.07.23 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Sun, 03 Mar 2013 21:07:24 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2013 15:04:54 +1000 Message-Id: X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQk2dIu6OJEmPZKrmCEpGKi8aemOWibB5uI8mY0acru/e0Dp0PPaz6/5QEcyG/YC32GTspYs X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.42 Cc: edgar.iglesias@gmail.com, Peter Crosthwaite , peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v2 4/5] xilinx_spips: QOM styling fixes 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 Few fixes for the latest QOM styling guides. Signed-off-by: Peter Crosthwaite --- hw/xilinx_spips.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/hw/xilinx_spips.c b/hw/xilinx_spips.c index 45a1c51..530ef47 100644 --- a/hw/xilinx_spips.c +++ b/hw/xilinx_spips.c @@ -154,6 +154,11 @@ typedef struct { hwaddr lqspi_cached_addr; } XilinxSPIPS; +#define TYPE_XILINX_SPIPS "xilinx,spips" + +#define XILINX_SPIPS(obj) \ + OBJECT_CHECK(XilinxSPIPS, (obj), TYPE_XILINX_SPIPS) + static inline int num_effective_busses(XilinxSPIPS *s) { return (s->regs[R_LQSPI_CFG] & LQSPI_CFG_SEP_BUS && @@ -210,7 +215,7 @@ static void xilinx_spips_update_ixr(XilinxSPIPS *s) static void xilinx_spips_reset(DeviceState *d) { - XilinxSPIPS *s = DO_UPCAST(XilinxSPIPS, busdev.qdev, d); + XilinxSPIPS *s = XILINX_SPIPS(d); int i; for (i = 0; i < R_MAX; i++) { @@ -500,9 +505,10 @@ static const MemoryRegionOps lqspi_ops = { } }; -static int xilinx_spips_init(SysBusDevice *dev) +static void xilinx_spips_realize(DeviceState *dev, Error **errp) { - XilinxSPIPS *s = FROM_SYSBUS(typeof(*s), dev); + XilinxSPIPS *s = XILINX_SPIPS(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); int i; DB_PRINT("inited device model\n"); @@ -511,31 +517,29 @@ static int xilinx_spips_init(SysBusDevice *dev) for (i = 0; i < s->num_busses; ++i) { char bus_name[16]; snprintf(bus_name, 16, "spi%d", i); - s->spi[i] = ssi_create_bus(&dev->qdev, bus_name); + s->spi[i] = ssi_create_bus(dev, bus_name); } s->cs_lines = g_new0(qemu_irq, s->num_cs * s->num_busses); ssi_auto_connect_slaves(DEVICE(s), s->cs_lines, s->spi[0]); ssi_auto_connect_slaves(DEVICE(s), s->cs_lines, s->spi[1]); - sysbus_init_irq(dev, &s->irq); + sysbus_init_irq(sbd, &s->irq); for (i = 0; i < s->num_cs * s->num_busses; ++i) { - sysbus_init_irq(dev, &s->cs_lines[i]); + sysbus_init_irq(sbd, &s->cs_lines[i]); } memory_region_init_io(&s->iomem, &spips_ops, s, "spi", R_MAX*4); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); memory_region_init_io(&s->mmlqspi, &lqspi_ops, s, "lqspi", (1 << LQSPI_ADDRESS_BITS) * 2); - sysbus_init_mmio(dev, &s->mmlqspi); + sysbus_init_mmio(sbd, &s->mmlqspi); s->irqline = -1; s->lqspi_cached_addr = ~0ULL; fifo8_create(&s->rx_fifo, RXFF_A); fifo8_create(&s->tx_fifo, TXFF_A); - - return 0; } static int xilinx_spips_post_load(void *opaque, int version_id) @@ -569,16 +573,15 @@ static Property xilinx_spips_properties[] = { static void xilinx_spips_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); - sdc->init = xilinx_spips_init; + dc->realize = xilinx_spips_realize; dc->reset = xilinx_spips_reset; dc->props = xilinx_spips_properties; dc->vmsd = &vmstate_xilinx_spips; } static const TypeInfo xilinx_spips_info = { - .name = "xilinx,spips", + .name = TYPE_XILINX_SPIPS, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(XilinxSPIPS), .class_init = xilinx_spips_class_init,