From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOVjI-0002BB-Tv for qemu-devel@nongnu.org; Sat, 06 Apr 2013 12:12:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UOVjB-0005ja-K9 for qemu-devel@nongnu.org; Sat, 06 Apr 2013 12:12:36 -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]:33592 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOVjB-0005jK-CX for qemu-devel@nongnu.org; Sat, 06 Apr 2013 12:12:29 -0400 From: Peter Maydell Date: Sat, 6 Apr 2013 16:44:36 +0100 Message-Id: <1365263076-16909-12-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1365263076-16909-1-git-send-email-peter.maydell@linaro.org> References: <1365263076-16909-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v4 11/11] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Arnd Bergmann , "Michael S. Tsirkin" , patches@linaro.org, Will Deacon , Paul Brook , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 e99f35f..540daf7 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 = 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; } -- 1.7.9.5