commit 7ac901cd18c382b9e7a07ac0b3a47f86d1ed4c1d
author Isaku Yamahata <yamahata@valinux.co.jp> Thu Nov 12 14:58:32 2009 +0900
committer Michael S. Tsirkin <mst@redhat.com> Tue Dec 01 17:51:26 2009 +0200
tree b62c0a29adc3cd00e9d1558614cb9d0ac0f02464
parent 4677d8ed9db8564fb0b02c1d012d4b25de633290

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>

hw/pci_host.c

diff --git a/hw/pci_host.c b/hw/pci_host.c
index 4a29f44..ccefa34 100644
--- a/hw/pci_host.c
+++ b/hw/pci_host.c
@@ -47,15 +47,10 @@
     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 @@
 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);