diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-17 15:44:20 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-17 15:44:20 -0600 |
| commit | b895e663f4ade8d8546bc57ea22b40e4bc993c6c (patch) | |
| tree | 22f754338aa4e20d5ce48065c0f109d41a58a4e9 /arch | |
| parent | 6dabee73d46bfafb8c588b21b14606914de97ee6 (diff) | |
| parent | 2ccc246d9c6eaa6596818ff917721a444acd0b61 (diff) | |
| download | linux-b895e663f4ade8d8546bc57ea22b40e4bc993c6c.tar.gz linux-b895e663f4ade8d8546bc57ea22b40e4bc993c6c.tar.bz2 linux-b895e663f4ade8d8546bc57ea22b40e4bc993c6c.zip | |
Merge branch 'pci/jiang-get-domain-bus-slot' into next
* pci/jiang-get-domain-bus-slot:
xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot()
PCI: Use hotplug-safe pci_get_domain_bus_and_slot()
PCI/cpcihp: Use hotplug-safe pci_get_domain_bus_and_slot()
PCI/vga: Use hotplug-safe pci_get_domain_bus_and_slot()
ia64/PCI: Use hotplug-safe pci_get_domain_bus_and_slot()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/sn/kernel/io_common.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c index fbb5f2f87eed..8630875e74b5 100644 --- a/arch/ia64/sn/kernel/io_common.c +++ b/arch/ia64/sn/kernel/io_common.c @@ -229,7 +229,6 @@ void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info, { int segment = pci_domain_nr(dev->bus); struct pcibus_bussoft *bs; - struct pci_bus *host_pci_bus; struct pci_dev *host_pci_dev; unsigned int bus_no, devfn; @@ -245,8 +244,7 @@ void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info, bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff; devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff; - host_pci_bus = pci_find_bus(segment, bus_no); - host_pci_dev = pci_get_slot(host_pci_bus, devfn); + host_pci_dev = pci_get_domain_bus_and_slot(segment, bus_no, devfn); pcidev_info->host_pci_dev = host_pci_dev; pcidev_info->pdi_linux_pcidev = dev; |