13 files changed, 19 insertions, 19 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 12d070ca7674..fdc34b599e7b 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -910,7 +910,7 @@ static int disable_device(struct acpiphp_slot *slot)
                                 disable_bridges(pdev->subordinate);
                                 pci_disable_device(pdev);
                         }
-                        pci_remove_bus_device(pdev);
+                        pci_stop_and_remove_bus_device(pdev);
                         pci_dev_put(pdev);
                 }
         }
@@ -1067,7 +1067,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
                                         res->end) {
                                 /* Could not assign a required resources
                                  * for this device, remove it */
-                                pci_remove_bus_device(dev);
+                                pci_stop_and_remove_bus_device(dev);
                                 break;
                         }
                 }
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index 829c327cfb5e..ae853ccd0cd5 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -341,7 +341,7 @@ int cpci_unconfigure_slot(struct slot* slot)
                 dev = pci_get_slot(slot->bus,
                                     PCI_DEVFN(PCI_SLOT(slot->devfn), i));
                 if (dev) {
-                        pci_remove_bus_device(dev);
+                        pci_stop_and_remove_bus_device(dev);
                         pci_dev_put(dev);
                 }
         }
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 6173b9a4544e..1c8494021a42 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -127,7 +127,7 @@ int cpqhp_unconfigure_device(struct pci_func* func)
                 struct pci_dev* temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j));
                 if (temp) {
                         pci_dev_put(temp);
-                        pci_remove_bus_device(temp);
+                        pci_stop_and_remove_bus_device(temp);
                 }
         }
         return 0;
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 17d10e2e8fb6..a019c9a712be 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -40,7 +40,7 @@ static ssize_t legacy_show(struct kobject *kobj, struct attribute *attr,
 
 static void remove_callback(void *data)
 {
-        pci_remove_bus_device((struct pci_dev *)data);
+        pci_stop_and_remove_bus_device((struct pci_dev *)data);
 }
 
 static ssize_t legacy_store(struct kobject *kobj, struct attribute *attr,
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 5506e0e8fbc0..4fda7e6a86a7 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -721,7 +721,7 @@ static void ibm_unconfigure_device(struct pci_func *func)
         for (j = 0; j < 0x08; j++) {
                 temp = pci_get_bus_and_slot(func->busno, (func->device << 3) | j);
                 if (temp) {
-                        pci_remove_bus_device(temp);
+                        pci_stop_and_remove_bus_device(temp);
                         pci_dev_put(temp);
                 }
         }
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index a4031dfe938e..47d9dc06b109 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -141,7 +141,7 @@ int pciehp_unconfigure_device(struct slot *p_slot)
                                 break;
                         }
                 }
-                pci_remove_bus_device(temp);
+                pci_stop_and_remove_bus_device(temp);
                 /*
                  * Ensure that no new Requests will be generated from
                  * the device.
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index c56a9413e1af..1e117c2a3cad 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -389,7 +389,7 @@ int dlpar_remove_pci_slot(char *drc_name, struct device_node *dn)
         BUG_ON(!bus->self);
         pr_debug("PCI: Now removing bridge device %s\n", pci_name(bus->self));
         eeh_remove_bus_device(bus->self);
-        pci_remove_bus_device(bus->self);
+        pci_stop_and_remove_bus_device(bus->self);
 
         return 0;
 }
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 72d507b6a2aa..de573113c102 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -554,7 +554,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                                              PCI_FUNC(func)));
                 if (dev) {
                         sn_bus_free_data(dev);
-                        pci_remove_bus_device(dev);
+                        pci_stop_and_remove_bus_device(dev);
                         pci_dev_put(dev);
                 }
         }
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index a2ccfcd3c298..df7e4bfadae3 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -124,7 +124,7 @@ int shpchp_unconfigure_device(struct slot *p_slot)
                                 break;
                         }
                 }
-                pci_remove_bus_device(temp);
+                pci_stop_and_remove_bus_device(temp);
                 pci_dev_put(temp);
         }
         return rc;
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 687b3c8e8e3b..6554e1a0f634 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -142,7 +142,7 @@ failed2:
 failed1:
         pci_dev_put(dev);
         mutex_lock(&iov->dev->sriov->lock);
-        pci_remove_bus_device(virtfn);
+        pci_stop_and_remove_bus_device(virtfn);
         virtfn_remove_bus(dev->bus, virtfn_bus(dev, id));
         mutex_unlock(&iov->dev->sriov->lock);
 
@@ -182,7 +182,7 @@ static void virtfn_remove(struct pci_dev *dev, int id, int reset)
                 sysfs_remove_link(&virtfn->dev.kobj, "physfn");
 
         mutex_lock(&iov->dev->sriov->lock);
-        pci_remove_bus_device(virtfn);
+        pci_stop_and_remove_bus_device(virtfn);
         virtfn_remove_bus(dev->bus, virtfn_bus(dev, id));
         mutex_unlock(&iov->dev->sriov->lock);
 
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index d9723039e99a..a55e248618cd 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -330,7 +330,7 @@ static void remove_callback(struct device *dev)
         struct pci_dev *pdev = to_pci_dev(dev);
 
         mutex_lock(&pci_remove_rescan_mutex);
-        pci_remove_bus_device(pdev);
+        pci_stop_and_remove_bus_device(pdev);
         mutex_unlock(&pci_remove_rescan_mutex);
 }
 
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 82f8ae572703..7abe67b45cc8 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -79,7 +79,7 @@ EXPORT_SYMBOL(pci_remove_bus);
 
 static void __pci_remove_behind_bridge(struct pci_dev *dev);
 /**
- * pci_remove_bus_device - remove a PCI device and any children
+ * pci_stop_and_remove_bus_device - remove a PCI device and any children
  * @dev: the device to remove
  *
  * Remove a PCI device from the device lists, informing the drivers
@@ -102,7 +102,7 @@ static void __pci_remove_bus_device(struct pci_dev *dev)
 
         pci_destroy_dev(dev);
 }
-void pci_remove_bus_device(struct pci_dev *dev)
+void pci_stop_and_remove_bus_device(struct pci_dev *dev)
 {
         pci_stop_bus_device(dev);
         __pci_remove_bus_device(dev);
@@ -145,7 +145,7 @@ static void pci_stop_bus_devices(struct pci_bus *bus)
         struct list_head *l, *n;
 
         /*
-         * VFs could be removed by pci_remove_bus_device() in the
+         * VFs could be removed by pci_stop_and_remove_bus_device() in the
          *  pci_stop_bus_devices() code path for PF.
          *  aka, bus->devices get updated in the process.
          * but VFs are inserted after PFs when SRIOV is enabled for PF,
@@ -174,6 +174,6 @@ void pci_stop_bus_device(struct pci_dev *dev)
         pci_stop_dev(dev);
 }
 
-EXPORT_SYMBOL(pci_remove_bus_device);
+EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
 EXPORT_SYMBOL(pci_remove_behind_bridge);
 EXPORT_SYMBOL_GPL(pci_stop_bus_device);
diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
index 7cf3d2fcf56a..fb8a39c7c3d6 100644
--- a/drivers/pci/xen-pcifront.c
+++ b/drivers/pci/xen-pcifront.c
@@ -544,7 +544,7 @@ static void free_root_bus_devs(struct pci_bus *bus)
                 dev = container_of(bus->devices.next, struct pci_dev,
                                    bus_list);
                 dev_dbg(&dev->dev, "removing device\n");
-                pci_remove_bus_device(dev);
+                pci_stop_and_remove_bus_device(dev);
         }
 }
 
@@ -1045,7 +1045,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
                                 domain, bus, slot, func);
                         continue;
                 }
-                pci_remove_bus_device(pci_dev);
+                pci_stop_and_remove_bus_device(pci_dev);
                 pci_dev_put(pci_dev);
 
                 dev_dbg(&pdev->xdev->dev,