From patchwork Wed Aug 3 03:10:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 9260713 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 46F9160467 for ; Wed, 3 Aug 2016 03:11:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3904F28547 for ; Wed, 3 Aug 2016 03:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D94C2854A; Wed, 3 Aug 2016 03:11:17 +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 60B5D28547 for ; Wed, 3 Aug 2016 03:11:16 +0000 (UTC) Received: from localhost ([::1]:59913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUmaR-0005eS-IB for patchwork-qemu-devel@patchwork.kernel.org; Tue, 02 Aug 2016 23:11:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUmZz-0005d0-RL for qemu-devel@nongnu.org; Tue, 02 Aug 2016 23:10:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUmZy-0006sX-Iq for qemu-devel@nongnu.org; Tue, 02 Aug 2016 23:10:47 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:36643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUmZy-0006sT-6J for qemu-devel@nongnu.org; Tue, 02 Aug 2016 23:10:46 -0400 Received: by mail-pf0-x242.google.com with SMTP id y134so13680961pfg.3 for ; Tue, 02 Aug 2016 20:10:46 -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=dB63dgbMyWBrOOpO5pf4Gb/RvJL/bUGkPjC0xUoKT5auQxwHtj9Dchg7jvbpZr+Zjz WY4tcBq4TZd8bzZGwHPmIsb1hmFKkl7hqg4/8S41n/1K/SlavmJxLuiEKQSM3P2Ojnus XxHxGoDgDj9/uYYIt7JH0jDyUuCA3sXzq7/Mzn/h54JitXEnunhuVRjKqjsoLcgCMbKh ytne9XxRi7eoXXDpR+ZdRVzb11VmyCTLIXC8ucGqQebScksS41QC8WQ8BiyAKw5iQCBr H29+ZeOPFCt17CyjhmTlOXXZclQZmzF/E42NDW1yrt0r3n6cul+4CbkVI7+pdXPWCBkC 6P7g== 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=UUoobtf2vVxh8ZcSCDtDaOMRveNl32YEk0GfdF+JR/jxTp6+TTBSvupvXDpnWImzk0 Zwh97NZHqdFVDrf14qkJ4G4zh8iEOEEpv5wPapDn960zUHEilL38JSwUhZds5glkvO7b TRPAMjn9rM9vzXF0Q9K/1+N8452dc6mc0XGS7oFPuO1TnGmMmz+6CHn6gUJJwYFQQd9g cmIvtP7bZZ9/zrYcMhoMAHap7a01mm5YXmjm+zTEutD0E7YxcaZkQoHM+DczvVvRKGnX j8NMQmI8EZVh4vvvi9CwkLfIezwZaDryhr3ocwyNovShrwLs2ByPXXKV2rYgdbat+tVX BaMw== X-Gm-Message-State: AEkoouuUGNbBfSjKXmLyxQlB1JQsGTHPUyJgSaXDX3qObsCPUMUr/Q0OZ//1ltG9+FO54A== X-Received: by 10.98.31.219 with SMTP id l88mr112131298pfj.155.1470193845596; Tue, 02 Aug 2016 20:10:45 -0700 (PDT) Received: from localhost ([2601:646:8581:937e:fc58:edc5:1254:cc96]) by smtp.gmail.com with ESMTPSA id yj3sm7920706pac.42.2016.08.02.20.10.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Aug 2016 20:10:44 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 2 Aug 2016 20:10:43 -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::242 Subject: [Qemu-devel] [PATCH v6 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, 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])); } }