From patchwork Sat Jul 23 16:42:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 9244617 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 2B97960213 for ; Sat, 23 Jul 2016 16:42:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CEEA2807B for ; Sat, 23 Jul 2016 16:42:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10DEA28169; Sat, 23 Jul 2016 16:42:46 +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 3F5662807B for ; Sat, 23 Jul 2016 16:42:45 +0000 (UTC) Received: from localhost ([::1]:52965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bR00i-0000NC-BM for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Jul 2016 12:42:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bR00F-0000Kk-Qp for qemu-devel@nongnu.org; Sat, 23 Jul 2016 12:42:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bR00D-0006fL-L7 for qemu-devel@nongnu.org; Sat, 23 Jul 2016 12:42:14 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:33442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bR00D-0006fH-AS for qemu-devel@nongnu.org; Sat, 23 Jul 2016 12:42:13 -0400 Received: by mail-pf0-x243.google.com with SMTP id i6so9062955pfe.0 for ; Sat, 23 Jul 2016 09:42:13 -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=MKT8tV4rb9Fr3pqHts0WBtyxPKQCoRpwfHOYy5SVGXsc+zt4pb5TVFTkcEeVfvLUZr sCMcUtM88FMoWh/sp0aMYYx5XQCV92gh1niXHv62PhAoRWKoWMDhccGtK3ZoNBkvrm+m qUlXf6JjGodv6j+dfjvZXATuk24DNKirfwIo8MV/Q+U6T/UfEPwSydLXBu1OgEOCPrAf gAGOomNsOZgk0X6oP9rT/VHcjaCYhhdZDq5fFI2GWTNBalUF8bqF9QcYJDvQEFlGwLmN w7JJqG+uHCw0lRYMGMwTH4RNL0TyXXGOzZG1xzceeWTKEg5Lfd03sI1rYlX8SZoquyyt 1WUw== 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=EYa8gwCMa8mWJHYy9AlXBMi+OBjbbTicDxKCYYIVrPeK46r36XjzKXK5OH9iqWZ7QY Vtww3XPPe2jrW6nrAgjyfZ3ftivH6u97s141HvXXj57BCzWyNBjHcZqDmF2uHhzs8gYI RjOdiSh58dYaoa3hoHszXbfytRNx+st0XUxjDLnycUyK+3YeDtjot2M2BKtL2WGFR3qH 5oKEmmbGuoO8rd6qLqYEKW0ybPIGk1dJhNEboK9QDK+G5KEC9oklaTqdR+0lqUjFWl3S h7GVvUzAVwe+k9NeFGCfQyZoBWxKIli+kV6opfq+lpEIjveiBUVM54Dq6+MpofK04b1W hQlQ== X-Gm-Message-State: AEkoouvwEcwP9MHYvq8fSXjOZEBYRhbTLFV0Ovhm5liIRqJMfVfJkuHfm3YlY4sbLiwGeg== X-Received: by 10.98.29.201 with SMTP id d192mr16194134pfd.142.1469292132525; Sat, 23 Jul 2016 09:42:12 -0700 (PDT) Received: from localhost ([2601:646:8581:937e:a68a:c69f:cf0b:ebee]) by smtp.gmail.com with ESMTPSA id m5sm28315012paw.40.2016.07.23.09.42.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Jul 2016 09:42:11 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 23 Jul 2016 09:42:11 -0700 Message-Id: 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:c00::243 Subject: [Qemu-devel] [PATCH v4 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])); } }