Commit 6754b9e9 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge 



The old pci_remove_behind_bridge actually do stop and remove.

Make the name reflect that to reduce confusion.

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 210647af

drivers/pci/remove.c

+4 −3
Original line number Diff line number Diff line
@@ -127,14 +127,15 @@ static void pci_stop_behind_bridge(struct pci_dev *dev) 
}



/**

 * pci_remove_behind_bridge - remove all devices behind a PCI bridge

 * pci_stop_and_remove_behind_bridge - stop and remove all devices behind

 *					 a PCI bridge

 * @dev: PCI bridge device

 *

 * Remove all devices on the bus, except for the parent bridge.

 * This also removes any child buses, and any devices they may

 * contain in a depth-first manner.

 */

void pci_remove_behind_bridge(struct pci_dev *dev)

void pci_stop_and_remove_behind_bridge(struct pci_dev *dev)

{

	pci_stop_behind_bridge(dev);

	__pci_remove_behind_bridge(dev);
@@ -175,5 +176,5 @@ void pci_stop_bus_device(struct pci_dev *dev) 
}



EXPORT_SYMBOL(pci_stop_and_remove_bus_device);

EXPORT_SYMBOL(pci_remove_behind_bridge);

EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge);

EXPORT_SYMBOL_GPL(pci_stop_bus_device);

drivers/pcmcia/cardbus.c

+1 −1
Original line number Diff line number Diff line
@@ -108,5 +108,5 @@ void cb_free(struct pcmcia_socket *s) 
	struct pci_dev *bridge = s->cb_dev;



	if (bridge)

		pci_remove_behind_bridge(bridge);

		pci_stop_and_remove_behind_bridge(bridge);

}

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -946,7 +946,7 @@ int __must_check __pci_register_driver(struct pci_driver *, struct module *, 
	__pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)



void pci_unregister_driver(struct pci_driver *dev);

void pci_remove_behind_bridge(struct pci_dev *dev);

void pci_stop_and_remove_behind_bridge(struct pci_dev *dev);

struct pci_driver *pci_dev_driver(const struct pci_dev *dev);

int pci_add_dynid(struct pci_driver *drv,

		  unsigned int vendor, unsigned int device,