[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/11] hw/versatile_pci: Drop unnecessary vpb_pci
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v2 11/11] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr() |
Date: |
Tue, 26 Mar 2013 10:22:11 +0000 |
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 <address@hidden>
---
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 1575dd7..20092fe 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -192,11 +192,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)
{
@@ -222,7 +217,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,
@@ -230,7 +225,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;
}
--
1.7.9.5
- [Qemu-devel] [PATCH v2 00/11] Fix versatile_pci (now without breaking linux), Peter Maydell, 2013/03/26
- [Qemu-devel] [PATCH v2 11/11] hw/versatile_pci: Drop unnecessary vpb_pci_config_addr(),
Peter Maydell <=
- [Qemu-devel] [PATCH v2 10/11] versatile_pci: Expose PCI memory space to system, Peter Maydell, 2013/03/26
- [Qemu-devel] [PATCH v2 09/11] arm/realview: Fix mapping of PCI regions, Peter Maydell, 2013/03/26
- [Qemu-devel] [PATCH v2 06/11] versatile_pci: Put the host bridge PCI device at slot 29, Peter Maydell, 2013/03/26
- [Qemu-devel] [PATCH v2 01/11] versatile_pci: Fix hardcoded tabs, Peter Maydell, 2013/03/26
- [Qemu-devel] [PATCH v2 02/11] versatile_pci: Expose PCI I/O region on Versatile PB, Peter Maydell, 2013/03/26
- [Qemu-devel] [PATCH v2 07/11] versatile_pci: Implement the correct PCI IRQ mapping, Peter Maydell, 2013/03/26