From 270d2ca409c41681324c57890b425189944e9d1e Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 17 Aug 2012 10:07:00 -0600 Subject: [PATCH] --- yaml --- r: 324207 b: refs/heads/master c: 657c2077a2dab228fcf28a708df1b1bcf4195803 h: refs/heads/master i: 324205: b39621e0cfc5c145ecf6b5439281fbf10d872ae6 324203: d2515e0d4ab49a7b752f6853e57b67151306d562 324199: c99fc19cf8134a198c7be0640389181237baa1b8 324191: d23d364080d5f30c3c06df26724fe516fbea4a6c v: v3 --- [refs] | 2 +- trunk/drivers/pci/remove.c | 8 ++++---- trunk/include/linux/pci.h | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 130f0d590276..d7345304de3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a140577316268b3263fd169d339188ad1636af3 +refs/heads/master: 657c2077a2dab228fcf28a708df1b1bcf4195803 diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 04a4861b4749..534377f967ff 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -79,6 +79,8 @@ void pci_remove_bus(struct pci_bus *pci_bus) EXPORT_SYMBOL(pci_remove_bus); static void __pci_remove_behind_bridge(struct pci_dev *dev); +static void pci_stop_bus_device(struct pci_dev *dev); + /** * pci_stop_and_remove_bus_device - remove a PCI device and any children * @dev: the device to remove @@ -91,7 +93,7 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev); * device lists, remove the /proc entry, and notify userspace * (/sbin/hotplug). */ -void __pci_remove_bus_device(struct pci_dev *dev) +static void __pci_remove_bus_device(struct pci_dev *dev) { if (dev->subordinate) { struct pci_bus *b = dev->subordinate; @@ -103,7 +105,6 @@ void __pci_remove_bus_device(struct pci_dev *dev) pci_destroy_dev(dev); } -EXPORT_SYMBOL(__pci_remove_bus_device); void pci_stop_and_remove_bus_device(struct pci_dev *dev) { @@ -170,7 +171,7 @@ static void pci_stop_bus_devices(struct pci_bus *bus) * and so on). This also stop any subordinate buses and children in a * depth-first manner. */ -void pci_stop_bus_device(struct pci_dev *dev) +static void pci_stop_bus_device(struct pci_dev *dev) { if (dev->subordinate) pci_stop_bus_devices(dev->subordinate); @@ -180,4 +181,3 @@ void pci_stop_bus_device(struct pci_dev *dev) EXPORT_SYMBOL(pci_stop_and_remove_bus_device); EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); -EXPORT_SYMBOL_GPL(pci_stop_bus_device); diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 5faa8310eec9..54b5b2b2c2ec 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -734,9 +734,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); extern struct pci_dev *pci_dev_get(struct pci_dev *dev); extern void pci_dev_put(struct pci_dev *dev); extern void pci_remove_bus(struct pci_bus *b); -extern void __pci_remove_bus_device(struct pci_dev *dev); extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); -extern void pci_stop_bus_device(struct pci_dev *dev); void pci_setup_cardbus(struct pci_bus *bus); extern void pci_sort_breadthfirst(void); #define dev_is_pci(d) ((d)->bus == &pci_bus_type)