aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-25 16:54:22 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-27 15:14:55 -0500
commit6754b9e9c33502223db066de50dda8a876f70c2c (patch)
treeee7b1a9328bd01675f907c9d247ee9b2f4bad21f /drivers/pci
parent210647af897af8ef2d00828aa2a6b1b42206aae6 (diff)
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: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/remove.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 7abe67b45cc8..bd2be1c4c668 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -127,14 +127,15 @@ static void pci_stop_behind_bridge(struct pci_dev *dev)
127} 127}
128 128
129/** 129/**
130 * pci_remove_behind_bridge - remove all devices behind a PCI bridge 130 * pci_stop_and_remove_behind_bridge - stop and remove all devices behind
131 * a PCI bridge
131 * @dev: PCI bridge device 132 * @dev: PCI bridge device
132 * 133 *
133 * Remove all devices on the bus, except for the parent bridge. 134 * Remove all devices on the bus, except for the parent bridge.
134 * This also removes any child buses, and any devices they may 135 * This also removes any child buses, and any devices they may
135 * contain in a depth-first manner. 136 * contain in a depth-first manner.
136 */ 137 */
137void pci_remove_behind_bridge(struct pci_dev *dev) 138void pci_stop_and_remove_behind_bridge(struct pci_dev *dev)
138{ 139{
139 pci_stop_behind_bridge(dev); 140 pci_stop_behind_bridge(dev);
140 __pci_remove_behind_bridge(dev); 141 __pci_remove_behind_bridge(dev);
@@ -175,5 +176,5 @@ void pci_stop_bus_device(struct pci_dev *dev)
175} 176}
176 177
177EXPORT_SYMBOL(pci_stop_and_remove_bus_device); 178EXPORT_SYMBOL(pci_stop_and_remove_bus_device);
178EXPORT_SYMBOL(pci_remove_behind_bridge); 179EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge);
179EXPORT_SYMBOL_GPL(pci_stop_bus_device); 180EXPORT_SYMBOL_GPL(pci_stop_bus_device);