diff options
-rw-r--r-- | drivers/pci/remove.c | 8 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c index 04a4861b474..534377f967f 100644 --- a/drivers/pci/remove.c +++ b/drivers/pci/remove.c | |||
@@ -79,6 +79,8 @@ void pci_remove_bus(struct pci_bus *pci_bus) | |||
79 | EXPORT_SYMBOL(pci_remove_bus); | 79 | EXPORT_SYMBOL(pci_remove_bus); |
80 | 80 | ||
81 | static void __pci_remove_behind_bridge(struct pci_dev *dev); | 81 | static void __pci_remove_behind_bridge(struct pci_dev *dev); |
82 | static void pci_stop_bus_device(struct pci_dev *dev); | ||
83 | |||
82 | /** | 84 | /** |
83 | * pci_stop_and_remove_bus_device - remove a PCI device and any children | 85 | * pci_stop_and_remove_bus_device - remove a PCI device and any children |
84 | * @dev: the device to remove | 86 | * @dev: the device to remove |
@@ -91,7 +93,7 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev); | |||
91 | * device lists, remove the /proc entry, and notify userspace | 93 | * device lists, remove the /proc entry, and notify userspace |
92 | * (/sbin/hotplug). | 94 | * (/sbin/hotplug). |
93 | */ | 95 | */ |
94 | void __pci_remove_bus_device(struct pci_dev *dev) | 96 | static void __pci_remove_bus_device(struct pci_dev *dev) |
95 | { | 97 | { |
96 | if (dev->subordinate) { | 98 | if (dev->subordinate) { |
97 | struct pci_bus *b = dev->subordinate; | 99 | struct pci_bus *b = dev->subordinate; |
@@ -103,7 +105,6 @@ void __pci_remove_bus_device(struct pci_dev *dev) | |||
103 | 105 | ||
104 | pci_destroy_dev(dev); | 106 | pci_destroy_dev(dev); |
105 | } | 107 | } |
106 | EXPORT_SYMBOL(__pci_remove_bus_device); | ||
107 | 108 | ||
108 | void pci_stop_and_remove_bus_device(struct pci_dev *dev) | 109 | void pci_stop_and_remove_bus_device(struct pci_dev *dev) |
109 | { | 110 | { |
@@ -170,7 +171,7 @@ static void pci_stop_bus_devices(struct pci_bus *bus) | |||
170 | * and so on). This also stop any subordinate buses and children in a | 171 | * and so on). This also stop any subordinate buses and children in a |
171 | * depth-first manner. | 172 | * depth-first manner. |
172 | */ | 173 | */ |
173 | void pci_stop_bus_device(struct pci_dev *dev) | 174 | static void pci_stop_bus_device(struct pci_dev *dev) |
174 | { | 175 | { |
175 | if (dev->subordinate) | 176 | if (dev->subordinate) |
176 | pci_stop_bus_devices(dev->subordinate); | 177 | pci_stop_bus_devices(dev->subordinate); |
@@ -180,4 +181,3 @@ void pci_stop_bus_device(struct pci_dev *dev) | |||
180 | 181 | ||
181 | EXPORT_SYMBOL(pci_stop_and_remove_bus_device); | 182 | EXPORT_SYMBOL(pci_stop_and_remove_bus_device); |
182 | EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); | 183 | EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); |
183 | EXPORT_SYMBOL_GPL(pci_stop_bus_device); | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 5faa8310eec..54b5b2b2c2e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -734,9 +734,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); | |||
734 | extern struct pci_dev *pci_dev_get(struct pci_dev *dev); | 734 | extern struct pci_dev *pci_dev_get(struct pci_dev *dev); |
735 | extern void pci_dev_put(struct pci_dev *dev); | 735 | extern void pci_dev_put(struct pci_dev *dev); |
736 | extern void pci_remove_bus(struct pci_bus *b); | 736 | extern void pci_remove_bus(struct pci_bus *b); |
737 | extern void __pci_remove_bus_device(struct pci_dev *dev); | ||
738 | extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); | 737 | extern void pci_stop_and_remove_bus_device(struct pci_dev *dev); |
739 | extern void pci_stop_bus_device(struct pci_dev *dev); | ||
740 | void pci_setup_cardbus(struct pci_bus *bus); | 738 | void pci_setup_cardbus(struct pci_bus *bus); |
741 | extern void pci_sort_breadthfirst(void); | 739 | extern void pci_sort_breadthfirst(void); |
742 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type) | 740 | #define dev_is_pci(d) ((d)->bus == &pci_bus_type) |