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 /drivers/pci/hotplug | |
| 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 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/cpcihp_generic.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c index 81af764c629b..a6a71c41cdf8 100644 --- a/drivers/pci/hotplug/cpcihp_generic.c +++ b/drivers/pci/hotplug/cpcihp_generic.c @@ -154,12 +154,8 @@ static int __init cpcihp_generic_init(void) if(!r) return -EBUSY; - bus = pci_find_bus(0, bridge_busnr); - if (!bus) { - err("Invalid bus number %d", bridge_busnr); - return -EINVAL; - } - dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0)); + dev = pci_get_domain_bus_and_slot(0, bridge_busnr, + PCI_DEVFN(bridge_slot, 0)); if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { err("Invalid bridge device %s", bridge); pci_dev_put(dev); |