From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ4vF-0005rq-NC for qemu-devel@nongnu.org; Wed, 26 Oct 2011 10:57:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJ4v9-0007Uo-Tr for qemu-devel@nongnu.org; Wed, 26 Oct 2011 10:57:41 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:47822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ4v9-0007Q1-Ko for qemu-devel@nongnu.org; Wed, 26 Oct 2011 10:57:35 -0400 Received: by mail-wy0-f173.google.com with SMTP id 15so1940368wyh.4 for ; Wed, 26 Oct 2011 07:57:35 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 26 Oct 2011 16:56:31 +0200 Message-Id: <1319640996-26537-6-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1319640996-26537-1-git-send-email-benoit.canet@gmail.com> References: <1319640996-26537-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [PATCH 05/10] pxa2xx_pcmcia.c: merge calls to get_system_memory() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Signed-off-by: Benoit Canet --- hw/pxa2xx_pcmcia.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c index f428bd1..8538cca 100644 --- a/hw/pxa2xx_pcmcia.c +++ b/hw/pxa2xx_pcmcia.c @@ -120,6 +120,7 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level) PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base) { PXA2xxPCMCIAState *s; + MemoryRegion *system_memory = get_system_memory(); s = (PXA2xxPCMCIAState *) g_malloc0(sizeof(PXA2xxPCMCIAState)); @@ -127,7 +128,7 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base) /* Socket I/O Memory Space */ memory_region_init_io(&s->iomem, &pxa2xx_pcmcia_io_ops, s, "pcmcia_io", 0x04000000); - memory_region_add_subregion(get_system_memory(), base | 0x00000000, + memory_region_add_subregion(system_memory, base | 0x00000000, &s->iomem); /* Then next 64 MB is reserved */ @@ -135,13 +136,13 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base) /* Socket Attribute Memory Space */ memory_region_init_io(&s->attr_iomem, &pxa2xx_pcmcia_attr_ops, s, "pcmcia_attribute", 0x04000000); - memory_region_add_subregion(get_system_memory(), base | 0x08000000, + memory_region_add_subregion(system_memory, base | 0x08000000, &s->attr_iomem); /* Socket Common Memory Space */ memory_region_init_io(&s->common_iomem, &pxa2xx_pcmcia_common_ops, s, "pcmcia_common", 0x04000000); - memory_region_add_subregion(get_system_memory(), base | 0x0c000000, + memory_region_add_subregion(system_memory, base | 0x0c000000, &s->common_iomem); if (base == 0x30000000) -- 1.7.4.1