From af9277e69df688ebb8ccccb7edecc45f0f85ea51 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 19 Apr 2013 11:15:21 +0100 Subject: [PATCH] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr() 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/pci-host/versatile.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c index e99f35fa50..540daf75cc 100644 --- a/hw/pci-host/versatile.c +++ b/hw/pci-host/versatile.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; }