aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2009-11-12 14:58:32 +0900
committerMichael S. Tsirkin <mst@redhat.com>2009-12-01 17:51:26 +0200
commit7ac901cd18c382b9e7a07ac0b3a47f86d1ed4c1d (patch)
treeb62c0a29adc3cd00e9d1558614cb9d0ac0f02464 /hw
parent4677d8ed9db8564fb0b02c1d012d4b25de633290 (diff)
pci: remove pci_addr_to_config() by open code
This patch removes pci_addr_to_config() and open code it as suggested by Michael S. Tsirkin <mst@redhat.com>. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/pci_host.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/hw/pci_host.c b/hw/pci_host.c
index 4a29f44904..ccefa34a4a 100644
--- a/hw/pci_host.c
+++ b/hw/pci_host.c
@@ -47,15 +47,10 @@ static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr)
return pci_find_device(bus, bus_num, PCI_SLOT(devfn), PCI_FUNC(devfn));
}
-static inline uint32_t pci_addr_to_config(uint32_t addr)
-{
- return addr & (PCI_CONFIG_SPACE_SIZE - 1);
-}
-
void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
{
PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
- uint32_t config_addr = pci_addr_to_config(addr);
+ uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
if (!pci_dev)
return;
@@ -68,7 +63,7 @@ void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)
{
PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
- uint32_t config_addr = pci_addr_to_config(addr);
+ uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
uint32_t val;
assert(len == 1 || len == 2 || len == 4);