From patchwork Tue Jan 19 07:23:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 569820 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 BB54E140B04 for ; Tue, 19 Jan 2016 18:23:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=kd+NWzjh; dkim-atps=neutral Received: from localhost ([::1]:35422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQdh-0008DO-PX for incoming@patchwork.ozlabs.org; Tue, 19 Jan 2016 02:23:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQd8-00072n-J1 for qemu-devel@nongnu.org; Tue, 19 Jan 2016 02:23:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLQd7-0008Nz-Dh for qemu-devel@nongnu.org; Tue, 19 Jan 2016 02:23:06 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:34953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLQd7-0008Nl-3x for qemu-devel@nongnu.org; Tue, 19 Jan 2016 02:23:05 -0500 Received: by mail-pf0-x244.google.com with SMTP id 65so12779209pff.2 for ; Mon, 18 Jan 2016 23:23:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AAuanLGlrSoiLxup8QppIe6EsFzitESP1xMWKpmvttA=; b=kd+NWzjht7cuJwU5HMYH+DSmnhlWrjKKFZZgFs0v3VyKkztJw791sjs03wxgQ2enPR Gh4lXbcMM5WkuDXHdzr8nQn2eSgVjXKvj8jdHzAT2JaTnvXdiacorBrZVbzeuba3MrNC fdqKU5OWf7QbmufgEQOFX/8CGNKAyZ8b9w5KgzDeNM0QJCUXPBPk7qH3wCy8efNqQ0w3 hN7dpRf8DbAZmEarvujJ1yJdIAl1hLj3FeQQ36bBIPyZTvqdl2Gl/ATyqQA3DF4D6D3N yOxaexJlrHZBPQNFfAQ610Hd7bSwJwav9hkcRWLt7CscJw56jve/QikiTaYm1QSoXJOa +iHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=AAuanLGlrSoiLxup8QppIe6EsFzitESP1xMWKpmvttA=; b=euT/sG4TSqel6Lk6gwZuS1B9G5fnXN0hpJxgIY3Ov3/+rMTQ69hX6NGF4hJu8FBv7G f3tWwOdlAVmbNGWnPCzHd0Xg4Tihu8K6/8yqsbxxb3h4OpJNJPPt+VP4wshwfVw0+ezf 9Q2JkCuYN8YJmsjZH802YsIbKPSloPkNiWTOhrFZVH5FGQ5aQfAcyPAypcXU2rfzvNI3 BgvTLLe6v0baIPKOHADYswpd8S8b1GRDEHnO99xsp2neMMUMcpqteU/giwOQ76QJI92C RVV62Mu0JIjM19yqLTi8Yyr82awvB82Nl6V0SgGf4EbqHngeeOcFLdjF2aqh/JlZu4GR Yrqg== X-Gm-Message-State: ALoCoQmXY5X7O5QjUAW6vnSgMdaFi/sLFeExPgcsFxTK6E2JmXn9J4fs1xBJOP3BSMmpqWHg/HTPHsvYe1ax6WwoCzbddPHfmg== X-Received: by 10.98.13.195 with SMTP id 64mr42293042pfn.164.1453188184597; Mon, 18 Jan 2016 23:23:04 -0800 (PST) Received: from localhost ([2601:646:8501:c353:c839:244:eaf2:3cd]) by smtp.gmail.com with ESMTPSA id s19sm38780746pfs.62.2016.01.18.23.23.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2016 23:23:04 -0800 (PST) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, peter.crosthwaite@xilinx.com Date: Mon, 18 Jan 2016 23:23:03 -0800 Message-Id: <6271d3be8ad854789d88960ab5a3b09c2bb2eb31.1453187657.git.alistair@alistair23.me> X-Mailer: git-send-email 2.5.0 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Cc: peter.maydell@linaro.org, konstanty@ieee.org, alistair23@gmail.com Subject: [Qemu-devel] [PATCH v3 1/7] STM32F205: Remove the individual device variables 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 Cleanup the individual DeviceState and SysBusDevice variables to re-use the same variable for each device. Signed-off-by: Alistair Francis Reviewed-by: Peter Crosthwaite --- hw/arm/stm32f205_soc.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 79bfe6d..a2bd970 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -60,8 +60,8 @@ static void stm32f205_soc_initfn(Object *obj) static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp) { STM32F205State *s = STM32F205_SOC(dev_soc); - DeviceState *syscfgdev, *usartdev, *timerdev, *nvic; - SysBusDevice *syscfgbusdev, *usartbusdev, *timerbusdev; + DeviceState *dev, *nvic; + SysBusDevice *busdev; Error *err = NULL; int i; @@ -92,43 +92,41 @@ static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp) s->kernel_filename, s->cpu_model); /* System configuration controller */ - syscfgdev = DEVICE(&s->syscfg); + dev = DEVICE(&s->syscfg); object_property_set_bool(OBJECT(&s->syscfg), true, "realized", &err); if (err != NULL) { error_propagate(errp, err); return; } - syscfgbusdev = SYS_BUS_DEVICE(syscfgdev); - sysbus_mmio_map(syscfgbusdev, 0, 0x40013800); - sysbus_connect_irq(syscfgbusdev, 0, qdev_get_gpio_in(nvic, 71)); + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, 0x40013800); + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(nvic, 71)); /* Attach UART (uses USART registers) and USART controllers */ for (i = 0; i < STM_NUM_USARTS; i++) { - usartdev = DEVICE(&(s->usart[i])); + dev = DEVICE(&(s->usart[i])); object_property_set_bool(OBJECT(&s->usart[i]), true, "realized", &err); if (err != NULL) { error_propagate(errp, err); return; } - usartbusdev = SYS_BUS_DEVICE(usartdev); - sysbus_mmio_map(usartbusdev, 0, usart_addr[i]); - sysbus_connect_irq(usartbusdev, 0, - qdev_get_gpio_in(nvic, usart_irq[i])); + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, usart_addr[i]); + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(nvic, usart_irq[i])); } /* Timer 2 to 5 */ for (i = 0; i < STM_NUM_TIMERS; i++) { - timerdev = DEVICE(&(s->timer[i])); - qdev_prop_set_uint64(timerdev, "clock-frequency", 1000000000); + dev = DEVICE(&(s->timer[i])); + qdev_prop_set_uint64(dev, "clock-frequency", 1000000000); object_property_set_bool(OBJECT(&s->timer[i]), true, "realized", &err); if (err != NULL) { error_propagate(errp, err); return; } - timerbusdev = SYS_BUS_DEVICE(timerdev); - sysbus_mmio_map(timerbusdev, 0, timer_addr[i]); - sysbus_connect_irq(timerbusdev, 0, - qdev_get_gpio_in(nvic, timer_irq[i])); + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, timer_addr[i]); + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(nvic, timer_irq[i])); } }