From a1e86f9b57aa5b770af903df448cd652be9742e8 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Tue, 22 Nov 2011 21:06:53 -0800 Subject: [PATCH] --- yaml --- r: 283353 b: refs/heads/master c: 79cc9601c3e42b4f0650fe7e69132ebce7ab48f9 h: refs/heads/master i: 283351: f87b696565c06ad9fa91f802738a27d3fd70eb14 v: v3 --- [refs] | 2 +- trunk/drivers/pci/remove.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3b04fc5cd153..659b61525dbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca3671a83389eea1458929d22c66a69e955bfb07 +refs/heads/master: 79cc9601c3e42b4f0650fe7e69132ebce7ab48f9 diff --git a/trunk/drivers/pci/remove.c b/trunk/drivers/pci/remove.c index 7f87beed35ac..6def3624c688 100644 --- a/trunk/drivers/pci/remove.c +++ b/trunk/drivers/pci/remove.c @@ -89,9 +89,8 @@ EXPORT_SYMBOL(pci_remove_bus); * 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) { - pci_stop_bus_device(dev); if (dev->subordinate) { struct pci_bus *b = dev->subordinate; @@ -102,6 +101,11 @@ void pci_remove_bus_device(struct pci_dev *dev) pci_destroy_dev(dev); } +void pci_remove_bus_device(struct pci_dev *dev) +{ + pci_stop_bus_device(dev); + __pci_remove_bus_device(dev); +} /** * pci_remove_behind_bridge - remove all devices behind a PCI bridge @@ -117,7 +121,7 @@ void pci_remove_behind_bridge(struct pci_dev *dev) if (dev->subordinate) list_for_each_safe(l, n, &dev->subordinate->devices) - pci_remove_bus_device(pci_dev_b(l)); + __pci_remove_bus_device(pci_dev_b(l)); } static void pci_stop_bus_devices(struct pci_bus *bus)