Commit 210647af authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

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: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 3cf8b643

arch/arm/mach-ixp2000/ixdp2400.c

+2 −2
Original line number Diff line number Diff line
@@ -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();

arch/arm/mach-ixp2000/ixdp2800.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

		}

	}

arch/arm/mach-ixp2000/ixdp2x00.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

arch/powerpc/platforms/pseries/pci_dlpar.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/message/fusion/mptbase.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int mpt_remove_dead_ioc_func(void *arg) 
	if ((pdev == NULL))

		return -1;



	pci_remove_bus_device(pdev);

	pci_stop_and_remove_bus_device(pdev);

	return 0;

}