提交 657c2077 编写于 作者: B Bjorn Helgaas

PCI: Don't export stop_bus_device and remove_bus_device interfaces

The acpiphp hotplug driver was the only user of pci_stop_bus_device() and
__pci_remove_bus_device(), and it now uses pci_stop_and_remove_bus_device()
instead, so stop exposing these interfaces.

This removes these exported symbols:

    __pci_remove_bus_device
    pci_stop_bus_device
Tested-by: NYijing Wang <wangyijing@huawei.com>
Signed-off-by: NBjorn Helgaas <bhelgaas@google.com>
Acked-by: NYinghai Lu <yinghai@kernel.org>
上级 0a140577
...@@ -79,6 +79,8 @@ void pci_remove_bus(struct pci_bus *pci_bus) ...@@ -79,6 +79,8 @@ void pci_remove_bus(struct pci_bus *pci_bus)
EXPORT_SYMBOL(pci_remove_bus); EXPORT_SYMBOL(pci_remove_bus);
static void __pci_remove_behind_bridge(struct pci_dev *dev); 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 * pci_stop_and_remove_bus_device - remove a PCI device and any children
* @dev: the device to remove * @dev: the device to remove
...@@ -91,7 +93,7 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev); ...@@ -91,7 +93,7 @@ static void __pci_remove_behind_bridge(struct pci_dev *dev);
* device lists, remove the /proc entry, and notify userspace * device lists, remove the /proc entry, and notify userspace
* (/sbin/hotplug). * (/sbin/hotplug).
*/ */
void __pci_remove_bus_device(struct pci_dev *dev) static void __pci_remove_bus_device(struct pci_dev *dev)
{ {
if (dev->subordinate) { if (dev->subordinate) {
struct pci_bus *b = dev->subordinate; struct pci_bus *b = dev->subordinate;
...@@ -103,7 +105,6 @@ void __pci_remove_bus_device(struct pci_dev *dev) ...@@ -103,7 +105,6 @@ void __pci_remove_bus_device(struct pci_dev *dev)
pci_destroy_dev(dev); pci_destroy_dev(dev);
} }
EXPORT_SYMBOL(__pci_remove_bus_device);
void pci_stop_and_remove_bus_device(struct pci_dev *dev) 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) ...@@ -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 * and so on). This also stop any subordinate buses and children in a
* depth-first manner. * 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) if (dev->subordinate)
pci_stop_bus_devices(dev->subordinate); pci_stop_bus_devices(dev->subordinate);
...@@ -180,4 +181,3 @@ void pci_stop_bus_device(struct pci_dev *dev) ...@@ -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_bus_device);
EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge); EXPORT_SYMBOL(pci_stop_and_remove_behind_bridge);
EXPORT_SYMBOL_GPL(pci_stop_bus_device);
...@@ -734,9 +734,7 @@ u8 pci_common_swizzle(struct pci_dev *dev, u8 *pinp); ...@@ -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 struct pci_dev *pci_dev_get(struct pci_dev *dev);
extern void pci_dev_put(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(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_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); void pci_setup_cardbus(struct pci_bus *bus);
extern void pci_sort_breadthfirst(void); extern void pci_sort_breadthfirst(void);
#define dev_is_pci(d) ((d)->bus == &pci_bus_type) #define dev_is_pci(d) ((d)->bus == &pci_bus_type)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册