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>
This commit is contained in:
parent
4677d8ed9d
commit
7ac901cd18
|
@ -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));
|
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)
|
void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
|
||||||
{
|
{
|
||||||
PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
|
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)
|
if (!pci_dev)
|
||||||
return;
|
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)
|
uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)
|
||||||
{
|
{
|
||||||
PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
|
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;
|
uint32_t val;
|
||||||
|
|
||||||
assert(len == 1 || len == 2 || len == 4);
|
assert(len == 1 || len == 2 || len == 4);
|
||||||
|
|
Reference in New Issue