From 8ea9dc5aee2b557620dd2d0f23f963fdd16134a0 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 25 Feb 2012 13:54:22 -0800 Subject: [PATCH] --- yaml --- r: 294784 b: refs/heads/master c: 6754b9e9c33502223db066de50dda8a876f70c2c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/remove.c | 7 ++++--- trunk/drivers/pcmcia/cardbus.c | 2 +- trunk/include/linux/pci.h | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0d08270942e5..3274c084d4b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 210647af897af8ef2d00828aa2a6b1b42206aae6 +refs/heads/master: 6754b9e9c33502223db066de50dda8a876f70c2c diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 7abe67b45cc8..bd2be1c4c668 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/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/trunk/drivers/pcmcia/cardbus.c b/trunk/drivers/pcmcia/cardbus.c index 9a58862f1401..6e75153c5b4f 100644 --- a/trunk/drivers/pcmcia/cardbus.c +++ b/trunk/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/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index a4c552d9908e..073ae9d97ad6 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/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,