提交 6754b9e9 编写于 作者: Y Yinghai Lu 提交者: Jesse Barnes

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: NJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: NYinghai Lu <yinghai@kernel.org>
Signed-off-by: NJesse Barnes <jbarnes@virtuousgeek.org>
上级 210647af
...@@ -127,14 +127,15 @@ static void pci_stop_behind_bridge(struct pci_dev *dev) ...@@ -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 * @dev: PCI bridge device
* *
* Remove all devices on the bus, except for the parent bridge. * Remove all devices on the bus, except for the parent bridge.
* This also removes any child buses, and any devices they may * This also removes any child buses, and any devices they may
* contain in a depth-first manner. * 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_stop_behind_bridge(dev);
__pci_remove_behind_bridge(dev); __pci_remove_behind_bridge(dev);
...@@ -175,5 +176,5 @@ void pci_stop_bus_device(struct pci_dev *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_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); EXPORT_SYMBOL_GPL(pci_stop_bus_device);
...@@ -108,5 +108,5 @@ void cb_free(struct pcmcia_socket *s) ...@@ -108,5 +108,5 @@ void cb_free(struct pcmcia_socket *s)
struct pci_dev *bridge = s->cb_dev; struct pci_dev *bridge = s->cb_dev;
if (bridge) if (bridge)
pci_remove_behind_bridge(bridge); pci_stop_and_remove_behind_bridge(bridge);
} }
...@@ -946,7 +946,7 @@ int __must_check __pci_register_driver(struct pci_driver *, struct module *, ...@@ -946,7 +946,7 @@ int __must_check __pci_register_driver(struct pci_driver *, struct module *,
__pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
void pci_unregister_driver(struct pci_driver *dev); 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); struct pci_driver *pci_dev_driver(const struct pci_dev *dev);
int pci_add_dynid(struct pci_driver *drv, int pci_add_dynid(struct pci_driver *drv,
unsigned int vendor, unsigned int device, unsigned int vendor, unsigned int device,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册