From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vp0NE-0007n6-3Y for qemu-devel@nongnu.org; Fri, 06 Dec 2013 13:43:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vp0ND-0003qB-7m for qemu-devel@nongnu.org; Fri, 06 Dec 2013 13:43:36 -0500 From: Stefan Weil Date: Fri, 6 Dec 2013 19:43:30 +0100 Message-Id: <1386355410-10805-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] hw/arm/highbank: Simplify code (memory region in device state) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: qemu-trivial@nongnu.org, Peter Maydell , Mark Langsdorf , Stefan Weil The memory region can be included by value instead of by reference in the device state (like it is done in other SoCs). Signed-off-by: Stefan Weil --- hw/arm/highbank.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index fe98ef1..54384b3 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -125,7 +125,7 @@ typedef struct { SysBusDevice parent_obj; /*< public >*/ - MemoryRegion *iomem; + MemoryRegion iomem; uint32_t regs[NUM_REGS]; } HighbankRegsState; @@ -154,10 +154,9 @@ static int highbank_regs_init(SysBusDevice *dev) { HighbankRegsState *s = HIGHBANK_REGISTERS(dev); - s->iomem = g_new(MemoryRegion, 1); - memory_region_init_io(s->iomem, OBJECT(s), &hb_mem_ops, s->regs, + memory_region_init_io(&s->iomem, OBJECT(s), &hb_mem_ops, s->regs, "highbank_regs", 0x1000); - sysbus_init_mmio(dev, s->iomem); + sysbus_init_mmio(dev, &s->iomem); return 0; } -- 1.7.10.4