PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device

The old pci_remove_bus_device actually did stop and remove.

Make the name reflect that to reduce confusion.

This patch is done by sed scripts and changes back some incorrect
__pci_remove_bus_device changes.

Suggested-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 2 insertions, 2 deletions

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