From patchwork Tue Jul 26 14:37:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 9248245 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86E31607D8 for ; Tue, 26 Jul 2016 14:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7800F22380 for ; Tue, 26 Jul 2016 14:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CD1B2723E; Tue, 26 Jul 2016 14:38:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C519322380 for ; Tue, 26 Jul 2016 14:38:18 +0000 (UTC) Received: from localhost ([::1]:40276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS3Uv-00065J-Sf for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jul 2016 10:38:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS3UQ-00061m-2T for qemu-devel@nongnu.org; Tue, 26 Jul 2016 10:37:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bS3UO-0000An-0F for qemu-devel@nongnu.org; Tue, 26 Jul 2016 10:37:45 -0400 Received: from mail-pa0-x244.google.com ([2607:f8b0:400e:c03::244]:35125) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bS3UN-0000AW-M0 for qemu-devel@nongnu.org; Tue, 26 Jul 2016 10:37:43 -0400 Received: by mail-pa0-x244.google.com with SMTP id cf3so82126pad.2 for ; Tue, 26 Jul 2016 07:37:43 -0700 (PDT) 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=i+hMGhUUKJ/uSW72uf7954oPcE+BltdjOsui8E8k5qE=; b=ancRd6IKEerFglwg1j7rAz/HXmxDDFvYqn36fKF1kyKqvj/EaUJ9OwNJXJZrWMLHPk NO966ZjnEFRbq7oaWzEw9iwlrr05tHe026VrRzFGqGVuWvqPO1/S3WWYSZzuq10D+GRh gr+zQciMP/7Bu6swRpSfU4Z1cW4XaoA2oAmEw9W+MvU1G54bO6scaKh+xsOW2Cf4uU5V uVigRhVi1I4kk4m+RRKHgCOJASDFh9gL03jmWxxImlJCWJFEaDLwQ/YnHNJBhUqxziUd XfcHcmGfLXnIIoW1wds6TRqwHWh/OM3tmoO5L3h/gye7p95eI9z2cwK4vxsHQUZNH3ru HIng== 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=i+hMGhUUKJ/uSW72uf7954oPcE+BltdjOsui8E8k5qE=; b=MQB3zfOSldwF9xYahfjqPl4qAmGfvjMumwwq5d4stobOpweqGIo1UfC7/lHZ+qyOUH KH0L+BpOwVWCAcYsma1XdAJEslal4/bhU+FCK2vW2UpllRdrDk2ADpabRaMLqVxMGjPZ NBVhkHCL0ZCKttrBOa4axQJpCH3RgCnV09+A4MMzNSQB2I+uJDfjPyNUYckok/JwcgM+ 6K5HlJn36OT49g92a+E6NKYgAF+0DN/foKyvnHpfJGjj+mDfVJgPbAIDeB5id8PHQREq hFuRwYE3CZ3q0Qf34wGCwkFetaJc1oX/Q3CEhCcjK4I97nKs6BBhPPE5i9ICLaEOBYHK 3wcA== X-Gm-Message-State: AEkooutNri266jiGoU8VVHdhWUiTHnG4fqCTHthQXnqFviYaA9xoD2X6eG55pD5JAQAJ2Q== X-Received: by 10.66.182.232 with SMTP id eh8mr40009947pac.146.1469543862868; Tue, 26 Jul 2016 07:37:42 -0700 (PDT) Received: from localhost ([2601:646:8581:937e:b117:7414:118e:4042]) by smtp.gmail.com with ESMTPSA id f3sm2215827pff.26.2016.07.26.07.37.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jul 2016 07:37:42 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 26 Jul 2016 07:37:41 -0700 Message-Id: <7801c0fe741545e677296439585d1af21cfd1255.1469514677.git.alistair@alistair23.me> X-Mailer: git-send-email 2.7.4 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:c03::244 Subject: [Qemu-devel] [PATCH v5 1/8] STM32F205: Remove the individual device variables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, peter.crosthwaite@xilinx.com, konstanty@ieee.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index de26b8c..5b6fa3b 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -62,8 +62,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; @@ -94,44 +94,43 @@ 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])); - qdev_prop_set_chr(usartdev, "chardev", i < MAX_SERIAL_PORTS ? serial_hds[i] : NULL); + dev = DEVICE(&(s->usart[i])); + qdev_prop_set_chr(dev, "chardev", + i < MAX_SERIAL_PORTS ? serial_hds[i] : NULL); 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])); } }