From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzBV4-0001Tv-KK for qemu-devel@nongnu.org; Thu, 01 Sep 2011 13:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzBV3-0004Yw-BB for qemu-devel@nongnu.org; Thu, 01 Sep 2011 13:56:26 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:37102) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzBV3-0004Yp-4M for qemu-devel@nongnu.org; Thu, 01 Sep 2011 13:56:25 -0400 From: Peter Maydell Date: Thu, 1 Sep 2011 18:36:52 +0100 Message-Id: <1314898613-2066-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1314898613-2066-1-git-send-email-peter.maydell@linaro.org> References: <1314898613-2066-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/2] hw/arm11mpcore: Clean up to avoid using sysbus_mmio_init_cb2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Avi Kivity , patches@linaro.org Clean up the initialisation of the realview_mpcore device to avoid using sysbus_init_mmio_cb2(): we can pass through the MemoryRegion of the private arm11mpcore_priv device directly now. Signed-off-by: Peter Maydell --- hw/arm11mpcore.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/hw/arm11mpcore.c b/hw/arm11mpcore.c index 7d60ef6..974a0d8 100644 --- a/hw/arm11mpcore.c +++ b/hw/arm11mpcore.c @@ -48,17 +48,6 @@ static void mpcore_rirq_set_irq(void *opaque, int irq, int level) } } -static void mpcore_rirq_map(SysBusDevice *dev, target_phys_addr_t base) -{ - mpcore_rirq_state *s = FROM_SYSBUS(mpcore_rirq_state, dev); - sysbus_mmio_map(s->priv, 0, base); -} - -static void mpcore_rirq_unmap(SysBusDevice *dev, target_phys_addr_t base) -{ - /* nothing to do */ -} - static int realview_mpcore_init(SysBusDevice *dev) { mpcore_rirq_state *s = FROM_SYSBUS(mpcore_rirq_state, dev); @@ -84,7 +73,7 @@ static int realview_mpcore_init(SysBusDevice *dev) } } qdev_init_gpio_in(&dev->qdev, mpcore_rirq_set_irq, 64); - sysbus_init_mmio_cb2(dev, mpcore_rirq_map, mpcore_rirq_unmap); + sysbus_init_mmio_region(dev, sysbus_mmio_get_region(s->priv, 0)); return 0; } -- 1.7.1