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()

3 files changed, 6 insertions, 20 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);
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index aeccc911abb8..b0fe7712b4d4 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -152,15 +152,11 @@ failed1:
 static void virtfn_remove(struct pci_dev *dev, int id, int reset)
 {
         char buf[VIRTFN_ID_LEN];
-        struct pci_bus *bus;
         struct pci_dev *virtfn;
         struct pci_sriov *iov = dev->sriov;
 
-        bus = pci_find_bus(pci_domain_nr(dev->bus), virtfn_bus(dev, id));
-        if (!bus)
-                return;
-
-        virtfn = pci_get_slot(bus, virtfn_devfn(dev, id));
+        virtfn = pci_get_domain_bus_and_slot(pci_domain_nr(dev->bus),
+                        virtfn_bus(dev, id), virtfn_devfn(dev, id));
         if (!virtfn)
                 return;
 
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index d6cc62cb4cf7..def8d0b5620c 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -982,7 +982,6 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
         int err = 0;
         int i, num_devs;
         unsigned int domain, bus, slot, func;
-        struct pci_bus *pci_bus;
         struct pci_dev *pci_dev;
         char str[64];
 
@@ -1032,13 +1031,8 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
                         goto out;
                 }
 
-                pci_bus = pci_find_bus(domain, bus);
-                if (!pci_bus) {
-                        dev_dbg(&pdev->xdev->dev, "Cannot get bus %04x:%02x\n",
-                                domain, bus);
-                        continue;
-                }
-                pci_dev = pci_get_slot(pci_bus, PCI_DEVFN(slot, func));
+                pci_dev = pci_get_domain_bus_and_slot(domain, bus,
+                                PCI_DEVFN(slot, func));
                 if (!pci_dev) {
                         dev_dbg(&pdev->xdev->dev,
                                 "Cannot get PCI device %04x:%02x:%02x.%d\n",