From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rcjzb-0002i0-QI for qemu-devel@nongnu.org; Mon, 19 Dec 2011 15:39:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RcjuU-0002QM-23 for qemu-devel@nongnu.org; Mon, 19 Dec 2011 15:35:16 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RcjuT-0002Oq-Dj for qemu-devel@nongnu.org; Mon, 19 Dec 2011 15:34:09 -0500 From: Peter Maydell Date: Mon, 19 Dec 2011 20:33:59 +0000 Message-Id: <1324326839-28915-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] =?utf-8?q?=5BPATCH=5D_hw/sysbus=2Ec=3A_Remove_unnece?= =?utf-8?q?ssary_conditionals?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Beno=C3=AEt=20Canet?= , patches@linaro.org Now that all sysbus MMIO regions are MemoryRegions, mmio[n].memory is never NULL, and we can remove some unnecessary conditionals. Signed-off-by: Peter Maydell --- A minor tidyup following Benoît's now-applied patches to remove sysbus_init_mmio_cb2(). hw/sysbus.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/hw/sysbus.c b/hw/sysbus.c index 81a57bd..24f619f 100644 --- a/hw/sysbus.c +++ b/hw/sysbus.c @@ -50,17 +50,12 @@ void sysbus_mmio_map(SysBusDevice *dev, int n, target_phys_addr_t addr) } if (dev->mmio[n].addr != (target_phys_addr_t)-1) { /* Unregister previous mapping. */ - if (dev->mmio[n].memory) { - memory_region_del_subregion(get_system_memory(), - dev->mmio[n].memory); - } + memory_region_del_subregion(get_system_memory(), dev->mmio[n].memory); } dev->mmio[n].addr = addr; - if (dev->mmio[n].memory) { - memory_region_add_subregion(get_system_memory(), - addr, - dev->mmio[n].memory); - } + memory_region_add_subregion(get_system_memory(), + addr, + dev->mmio[n].memory); } @@ -206,10 +201,7 @@ static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent) monitor_printf(mon, "%*sirq %d\n", indent, "", s->num_irq); for (i = 0; i < s->num_mmio; i++) { - size = 0; - if (s->mmio[i].memory) { - size = memory_region_size(s->mmio[i].memory); - } + size = memory_region_size(s->mmio[i].memory); monitor_printf(mon, "%*smmio " TARGET_FMT_plx "/" TARGET_FMT_plx "\n", indent, "", s->mmio[i].addr, size); } -- 1.7.5.4