From patchwork Fri Dec 2 14:51:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 128882 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 E1F701007D4 for ; Sat, 3 Dec 2011 01:51:26 +1100 (EST) Received: from localhost ([::1]:37021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWUSN-0000HX-1t for incoming@patchwork.ozlabs.org; Fri, 02 Dec 2011 09:51:19 -0500 Received: from eggs.gnu.org ([140.186.70.92]:60075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWUSG-0000HJ-KC for qemu-devel@nongnu.org; Fri, 02 Dec 2011 09:51:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RWUSF-0003s6-GX for qemu-devel@nongnu.org; Fri, 02 Dec 2011 09:51:12 -0500 Received: from mail-fx0-f45.google.com ([209.85.161.45]:35599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RWUSF-0003rg-Bj for qemu-devel@nongnu.org; Fri, 02 Dec 2011 09:51:11 -0500 Received: by mail-fx0-f45.google.com with SMTP id a20so623352faa.4 for ; Fri, 02 Dec 2011 06:51:10 -0800 (PST) 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 :mime-version:content-type:content-transfer-encoding; bh=3QB4+mWL1/pIRv3OnMNKBvB1638xRLJDxXV10r3IUQc=; b=JQjvz05x0JEzcAvFeq/Ual8+nsf32zNqJd31JRZfxsUToPVEoLMp8CKVvnwzSJsAfc oaFHcbsYaS4CBeVCtk1N6Ap2X5TAf0CmwabkxXGb+3bgEGJ0Kqaxv1Pq344NpxTFsuZD Acjbs+PWpvBh3FGPhvXA8BZSa6oP3LmfAR+Wk= Received: by 10.180.24.65 with SMTP id s1mr9978217wif.59.1322837470685; Fri, 02 Dec 2011 06:51:10 -0800 (PST) Received: from Laure.box.in.chocolate-blue.net ([109.190.18.76]) by mx.google.com with ESMTPS id ff1sm10498998wbb.5.2011.12.02.06.51.09 (version=SSLv3 cipher=OTHER); Fri, 02 Dec 2011 06:51:09 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Fri, 2 Dec 2011 15:51:02 +0100 Message-Id: <1322837462-17854-4-git-send-email-benoit.canet@gmail.com> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1322837462-17854-1-git-send-email-benoit.canet@gmail.com> References: <1322837462-17854-1-git-send-email-benoit.canet@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.45 Cc: peter.maydell@linaro.org, =?UTF-8?q?Beno=C3=AEt=20Canet?= , agraf@suse.de Subject: [Qemu-devel] [PATCH 3/3] sysbus: remove sysbus_init_mmio_cb2 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 This function is not longer in use so remove it. Signed-off-by: Benoît Canet --- hw/sysbus.c | 16 ---------------- hw/sysbus.h | 5 ----- 2 files changed, 0 insertions(+), 21 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index b315a8c..81a57bd 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -53,8 +53,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) if (dev->mmio[n].memory) { memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory); - } else if (dev->mmio[n].unmap) { - dev->mmio[n].unmap(dev, dev->mmio[n].addr); } } dev->mmio[n].addr = addr; @@ -62,8 +60,6 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) memory_region_add_subregion(get_system_memory(), addr, dev->mmio[n].memory); - } else if (dev->mmio[n].cb) { - dev->mmio[n].cb(dev, addr); } } @@ -89,18 +85,6 @@ void sysbus_pass_irq(SysBusDevice *dev, SysBusDevice *target) } } -void sysbus_init_mmio_cb2(SysBusDevice *dev, - mmio_mapfunc cb, mmio_mapfunc unmap) -{ - int n; - - assert(dev->num_mmio < QDEV_MAX_MMIO); - n = dev->num_mmio++; - dev->mmio[n].addr = -1; - dev->mmio[n].cb = cb; - dev->mmio[n].unmap = unmap; -} - void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory) { int n; diff --git a/hw/sysbus.h b/hw/sysbus.h index 9bac582..2f4025b 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -11,7 +11,6 @@ #define QDEV_MAX_IRQ 256 typedef struct SysBusDevice SysBusDevice; -typedef void (*mmio_mapfunc)(SysBusDevice *dev, target_phys_addr_t addr); struct SysBusDevice { DeviceState qdev; @@ -21,8 +20,6 @@ struct SysBusDevice { int num_mmio; struct { target_phys_addr_t addr; - mmio_mapfunc cb; - mmio_mapfunc unmap; MemoryRegion *memory; } mmio[QDEV_MAX_MMIO]; int num_pio; @@ -43,8 +40,6 @@ typedef struct { void sysbus_register_dev(const char *name, size_t size, sysbus_initfn init); void sysbus_register_withprop(SysBusDeviceInfo *info); void *sysbus_new(void); -void sysbus_init_mmio_cb2(SysBusDevice *dev, - mmio_mapfunc cb, mmio_mapfunc unmap); void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory); MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n); void sysbus_init_irq(SysBusDevice *dev, qemu_irq *p);