From patchwork Wed Oct 26 14:56:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 121918 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EC61D1007D2 for ; Thu, 27 Oct 2011 01:58:00 +1100 (EST) Received: from localhost ([::1]:60853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ4vQ-00066p-F7 for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2011 10:57:52 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=xhLASP76wOHK0Z+xLsWKEQzWp3sK+RuWO56+z24f+DI=; b=WKA4MwEn6N7PjXJGxjO0N3DseP8k3CtX9x+HOHGTzds+/HvL6k3upzZ/1JJFyGY5ik kCizYZtB1jFxZ6HyOQVTJ73FM8VNUt6ETAOyuyJPxxba2DO8dEzT0wtcYTaU/k3CB1I2 MMIvd1KXj2argSrwQq3dxXNV70E7Yn9IXEz10= Received: by 10.216.221.11 with SMTP id q11mr1067574wep.86.1319641054983; Wed, 26 Oct 2011 07:57:34 -0700 (PDT) Received: from localhost.localdomain ([78.250.72.86]) by mx.google.com with ESMTPS id fw16sm3617407wbb.13.2011.10.26.07.57.27 (version=SSLv3 cipher=OTHER); Wed, 26 Oct 2011 07:57:34 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2011 16:56:31 +0200 Message-Id: <1319640996-26537-6-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1319640996-26537-1-git-send-email-benoit.canet@gmail.com> References: <1319640996-26537-1-git-send-email-benoit.canet@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= , avi@redhat.com Subject: [Qemu-devel] [PATCH 05/10] pxa2xx_pcmcia.c: merge calls to get_system_memory() 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 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)