[Qemu-devel] [PATCH 05/10] pxa2xx_pcmcia.c: merge calls to get_system_memory()

[Benoît Canet]

Signed-off-by: Benoit Canet <address@hidden>
---
 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