summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-02-25 13:54:22 -0800
committerJesse Barnes <jbarnes@virtuousgeek.org>2012-02-27 12:14:55 -0800
commit6754b9e9c33502223db066de50dda8a876f70c2c (patch)
treeee7b1a9328bd01675f907c9d247ee9b2f4bad21f
parent210647af897af8ef2d00828aa2a6b1b42206aae6 (diff)
downloadlinux-3.10-6754b9e9c33502223db066de50dda8a876f70c2c.tar.gz
linux-3.10-6754b9e9c33502223db066de50dda8a876f70c2c.tar.bz2
linux-3.10-6754b9e9c33502223db066de50dda8a876f70c2c.zip
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>
-rw-r--r--drivers/pci/remove.c7
-rw-r--r--drivers/pcmcia/cardbus.c2
-rw-r--r--include/linux/pci.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 7abe67b45cc..bd2be1c4c66 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)
}
/**
- * 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);
diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c
index 9a58862f140..6e75153c5b4 100644
--- a/drivers/pcmcia/cardbus.c
+++ b/drivers/pcmcia/cardbus.c
@@ -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);
}
diff --git a/include/linux/pci.h b/include/linux/pci.h
index a4c552d9908..073ae9d97ad 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -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,