From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [RFC v5 82/86] sysbus: remove sysbus_init_mmio_cb() Date: Wed, 20 Jul 2011 19:50:32 +0300 Message-ID: <1311180636-17012-83-git-send-email-avi@redhat.com> References: <1311180636-17012-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:8713 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356Ab1GTQu4 (ORCPT ); Wed, 20 Jul 2011 12:50:56 -0400 In-Reply-To: <1311180636-17012-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: This problem with this function is that it is not reversible - it is impossible to know where things are registered and unregister them exactly. As there are no more users, we can remove it. Signed-off-by: Avi Kivity --- hw/sysbus.c | 12 ------------ hw/sysbus.h | 2 -- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index 64749e0..87221df 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -107,18 +107,6 @@ void sysbus_init_mmio(SysBusDevice *dev, target_phys_addr_t size, dev->mmio[n].iofunc = iofunc; } -void sysbus_init_mmio_cb(SysBusDevice *dev, target_phys_addr_t size, - mmio_mapfunc cb) -{ - int n; - - assert(dev->num_mmio < QDEV_MAX_MMIO); - n = dev->num_mmio++; - dev->mmio[n].addr = -1; - dev->mmio[n].size = size; - dev->mmio[n].cb = cb; -} - void sysbus_init_mmio_cb2(SysBusDevice *dev, mmio_mapfunc cb, mmio_mapfunc unmap) { diff --git a/hw/sysbus.h b/hw/sysbus.h index 16fd969..b87c6c5 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -47,8 +47,6 @@ void sysbus_register_withprop(SysBusDeviceInfo *info); void *sysbus_new(void); void sysbus_init_mmio(SysBusDevice *dev, target_phys_addr_t size, ram_addr_t iofunc); -void sysbus_init_mmio_cb(SysBusDevice *dev, target_phys_addr_t size, - mmio_mapfunc cb); void sysbus_init_mmio_cb2(SysBusDevice *dev, mmio_mapfunc cb, mmio_mapfunc unmap); void sysbus_init_mmio_region(SysBusDevice *dev, MemoryRegion *memory); -- 1.7.5.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qja7k-0007EG-CI for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qja7i-0006jh-4Q for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:59:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZyw-0004xN-Re for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:50:47 -0400 From: Avi Kivity Date: Wed, 20 Jul 2011 19:50:32 +0300 Message-Id: <1311180636-17012-83-git-send-email-avi@redhat.com> In-Reply-To: <1311180636-17012-1-git-send-email-avi@redhat.com> References: <1311180636-17012-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [RFC v5 82/86] sysbus: remove sysbus_init_mmio_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org This problem with this function is that it is not reversible - it is impossible to know where things are registered and unregister them exactly. As there are no more users, we can remove it. Signed-off-by: Avi Kivity --- hw/sysbus.c | 12 ------------ hw/sysbus.h | 2 -- 2 files changed, 0 insertions(+), 14 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index 64749e0..87221df 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -107,18 +107,6 @@ void sysbus_init_mmio(SysBusDevice *dev, target_phys_addr_t size, dev->mmio[n].iofunc = iofunc; } -void sysbus_init_mmio_cb(SysBusDevice *dev, target_phys_addr_t size, - mmio_mapfunc cb) -{ - int n; - - assert(dev->num_mmio < QDEV_MAX_MMIO); - n = dev->num_mmio++; - dev->mmio[n].addr = -1; - dev->mmio[n].size = size; - dev->mmio[n].cb = cb; -} - void sysbus_init_mmio_cb2(SysBusDevice *dev, mmio_mapfunc cb, mmio_mapfunc unmap) { diff --git a/hw/sysbus.h b/hw/sysbus.h index 16fd969..b87c6c5 100644 --- a/hw/sysbus.h +++ b/hw/sysbus.h @@ -47,8 +47,6 @@ void sysbus_register_withprop(SysBusDeviceInfo *info); void *sysbus_new(void); void sysbus_init_mmio(SysBusDevice *dev, target_phys_addr_t size, ram_addr_t iofunc); -void sysbus_init_mmio_cb(SysBusDevice *dev, target_phys_addr_t size, - mmio_mapfunc cb); void sysbus_init_mmio_cb2(SysBusDevice *dev, mmio_mapfunc cb, mmio_mapfunc unmap); void sysbus_init_mmio_region(SysBusDevice *dev, MemoryRegion *memory); -- 1.7.5.3