From patchwork Thu Apr 4 12:58:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 233819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DA86D2C00A3 for ; Fri, 5 Apr 2013 00:29:30 +1100 (EST) Received: from localhost ([::1]:57940 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNk4O-00010m-MD for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 09:19:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNk40-0000uB-TI for qemu-devel@nongnu.org; Thu, 04 Apr 2013 09:18:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNk3v-0008Qg-2v for qemu-devel@nongnu.org; Thu, 04 Apr 2013 09:18:48 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:33490 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNk3u-0008QR-SG for qemu-devel@nongnu.org; Thu, 04 Apr 2013 09:18:43 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UNjkQ-0005RU-0B; Thu, 04 Apr 2013 13:58:34 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 13:58:33 +0100 Message-Id: <1365080313-20875-12-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1365080313-20875-1-git-send-email-peter.maydell@linaro.org> References: <1365080313-20875-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Arnd Bergmann , "Michael S. Tsirkin" , patches@linaro.org, Will Deacon , Paul Brook , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno Subject: [Qemu-devel] [PATCH v3 11/11] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr() 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 Drop the vpb_pci_config_addr() function -- it is unnecessary since the size of the memory regions means the hwaddr is always within the 24 bit size. (This function was probably a leftover from when read/write functions were called with absolute addresses rather than relative ones.) Signed-off-by: Peter Maydell Acked-by: Paul Brook --- hw/versatile_pci.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index fa63b77..1baab98 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -214,11 +214,6 @@ static const MemoryRegionOps pci_vpb_reg_ops = { }, }; -static inline uint32_t vpb_pci_config_addr(hwaddr addr) -{ - return addr & 0xffffff; -} - static void pci_vpb_config_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { @@ -234,7 +229,7 @@ static void pci_vpb_config_write(void *opaque, hwaddr addr, } } } - pci_data_write(&s->pci_bus, vpb_pci_config_addr(addr), val, size); + pci_data_write(&s->pci_bus, addr, val, size); } static uint64_t pci_vpb_config_read(void *opaque, hwaddr addr, @@ -242,7 +237,7 @@ static uint64_t pci_vpb_config_read(void *opaque, hwaddr addr, { PCIVPBState *s = (PCIVPBState *)opaque; uint32_t val; - val = pci_data_read(&s->pci_bus, vpb_pci_config_addr(addr), size); + val = pci_data_read(&s->pci_bus, addr, size); return val; }