From patchwork Sat Apr 25 08:18:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 464464 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 5F1F614011B for ; Sat, 25 Apr 2015 18:19:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=WStODnuZ; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost ([::1]:47610 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlvIn-0002Ok-Cf for incoming@patchwork.ozlabs.org; Sat, 25 Apr 2015 04:19:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlvIL-0001SH-GB for qemu-devel@nongnu.org; Sat, 25 Apr 2015 04:18:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YlvIK-0000Di-D1 for qemu-devel@nongnu.org; Sat, 25 Apr 2015 04:18:37 -0400 Received: from mail-pd0-x231.google.com ([2607:f8b0:400e:c02::231]:33276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlvIK-0000Cy-6F for qemu-devel@nongnu.org; Sat, 25 Apr 2015 04:18:36 -0400 Received: by pdbnk13 with SMTP id nk13so71250250pdb.0 for ; Sat, 25 Apr 2015 01:18:35 -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=WpXJLZ27EelmJfC9c77Rr4JUNbOFMC/XY0egvglFq1I=; b=WStODnuZuQoNzizYk8l2Z7dRVstB8BhKdKxxfFSNnzx3y4rDHISxkN0ow38FpB55vA SgeIF3pvmB2Iwdl+j3dQkz+AGhV9lmS3FSriZezw56IQht6novlD2l7C3R2q3x+I6Bkk bjPQwIanmVJ16mjKGNJYGw4+lEXTHvPeDRn2yezgd1mpvcipozb5gT0JtqUanIcP3sPX 0BDmV26VKSKQ9YAt46yp9NP+rKqeh2/58vGGlRxQsdFArSz/tTMBrc/Wenmx+11bsyQy VPgi7npIY42lW1vG51iFEXcmFRr7M7JJRJXd4mMzD8aD9ASUCnVGWvcv0ZnFTvi5GyTM xC0g== X-Received: by 10.70.103.200 with SMTP id fy8mr4308973pdb.136.1429949915459; Sat, 25 Apr 2015 01:18:35 -0700 (PDT) Received: from localhost (220-245-42-228.tpgi.com.au. [220.245.42.228]) by mx.google.com with ESMTPSA id ei17sm13342898pac.20.2015.04.25.01.18.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Apr 2015 01:18:34 -0700 (PDT) From: Alistair Francis X-Google-Original-From: Alistair Francis To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 25 Apr 2015 18:18:31 +1000 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::231 Cc: alistair23@gmail.com Subject: [Qemu-devel] [PATCH v1 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 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index 0f3bdc7..63893f3 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -59,8 +59,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; - SysBusDevice *syscfgbusdev, *usartbusdev, *timerbusdev; + DeviceState *dev; + SysBusDevice *busdev; qemu_irq *pic; Error *err = NULL; int i; @@ -92,41 +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, pic[71]); + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, 0x40013800); + sysbus_connect_irq(busdev, 0, pic[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, pic[usart_irq[i]]); + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, usart_addr[i]); + sysbus_connect_irq(busdev, 0, pic[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, pic[timer_irq[i]]); + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, timer_addr[i]); + sysbus_connect_irq(busdev, 0, pic[timer_irq[i]]); } }