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>

4 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c
index f53e911ec94a..d519944653ad 100644
--- a/arch/arm/mach-ixp2000/ixdp2400.c
+++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -134,11 +134,11 @@ static void ixdp2400_pci_postinit(void)
 
         if (ixdp2x00_master_npu()) {
                 dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);
-                pci_remove_bus_device(dev);
+                pci_stop_and_remove_bus_device(dev);
                 pci_dev_put(dev);
         } else {
                 dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);
-                pci_remove_bus_device(dev);
+                pci_stop_and_remove_bus_device(dev);
                 pci_dev_put(dev);
 
                 ixdp2x00_slave_pci_postinit();
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index a2e7c393e74f..b415febd2025 100644
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -262,14 +262,14 @@ int __init ixdp2800_pci_init(void)
                 pci_common_init(&ixdp2800_pci);
                 if (ixdp2x00_master_npu()) {
                         dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);
-                        pci_remove_bus_device(dev);
+                        pci_stop_and_remove_bus_device(dev);
                         pci_dev_put(dev);
 
                         ixdp2800_master_enable_slave();
                         ixdp2800_master_wait_for_slave_bus_scan();
                 } else {
                         dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);
-                        pci_remove_bus_device(dev);
+                        pci_stop_and_remove_bus_device(dev);
                         pci_dev_put(dev);
                 }
         }
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 634b6c852f68..dd9838299068 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -239,12 +239,12 @@ void ixdp2x00_slave_pci_postinit(void)
          * Remove PMC device is there is one
          */
         if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {
-                pci_remove_bus_device(dev);
+                pci_stop_and_remove_bus_device(dev);
                 pci_dev_put(dev);
         }
 
         dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN);
-        pci_remove_bus_device(dev);
+        pci_stop_and_remove_bus_device(dev);
         pci_dev_put(dev);
 }
 
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 55d4ec1bd1ac..200a1ca2528e 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -84,7 +84,7 @@ void pcibios_remove_pci_devices(struct pci_bus *bus)
         list_for_each_entry_safe(dev, tmp, &bus->devices, bus_list) {
                 pr_debug("     * Removing %s...\n", pci_name(dev));
                 eeh_remove_bus_device(dev);
-                pci_remove_bus_device(dev);
+                pci_stop_and_remove_bus_device(dev);
         }
 }
 EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);