From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v2 17/37] PCI: Add __pci_remove_bus_devices()
Date: Fri, 9 Mar 2012 23:00:17 -0800 [thread overview]
Message-ID: <1331362837-10740-18-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1331362837-10740-1-git-send-email-yinghai@kernel.org>
Will use it with pci_stop_and_remove_bus later.
Also remove __pci_remove_behind_bridge and pci_stop_behind_bridge.
They are same except one take bridge and one take bus.
We already have pci_stop_bus_devices().
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/remove.c | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 243d59b..62c348c 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -78,7 +78,7 @@ 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_remove_bus_devices(struct pci_bus *bus);
/**
* pci_stop_and_remove_bus_device - remove a PCI device and any children
* @dev: the device to remove
@@ -96,7 +96,7 @@ void __pci_remove_bus_device(struct pci_dev *dev)
if (dev->subordinate) {
struct pci_bus *b = dev->subordinate;
- __pci_remove_behind_bridge(dev);
+ __pci_remove_bus_devices(b);
pci_remove_bus(b);
dev->subordinate = NULL;
}
@@ -111,22 +111,12 @@ void pci_stop_and_remove_bus_device(struct pci_dev *dev)
__pci_remove_bus_device(dev);
}
-static void __pci_remove_behind_bridge(struct pci_dev *dev)
+static void __pci_remove_bus_devices(struct pci_bus *bus)
{
struct list_head *l, *n;
- if (dev->subordinate)
- list_for_each_safe(l, n, &dev->subordinate->devices)
- __pci_remove_bus_device(pci_dev_b(l));
-}
-
-static void pci_stop_behind_bridge(struct pci_dev *dev)
-{
- struct list_head *l, *n;
-
- if (dev->subordinate)
- list_for_each_safe(l, n, &dev->subordinate->devices)
- pci_stop_bus_device(pci_dev_b(l));
+ list_for_each_safe(l, n, &bus->devices)
+ __pci_remove_bus_device(pci_dev_b(l));
}
static void pci_stop_bus_devices(struct pci_bus *bus)
@@ -158,8 +148,12 @@ static void pci_stop_bus_devices(struct pci_bus *bus)
*/
void pci_stop_and_remove_behind_bridge(struct pci_dev *dev)
{
- pci_stop_behind_bridge(dev);
- __pci_remove_behind_bridge(dev);
+ struct pci_bus *bus = dev->subordinate;
+
+ if (bus) {
+ pci_stop_bus_devices(bus);
+ __pci_remove_bus_devices(bus);
+ }
}
/**
--
1.7.7
next prev parent reply other threads:[~2012-03-10 7:00 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-10 7:00 [PATCH v2 00/37] PCI, x86: pci root bus hotplug support Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 01/37] IOMMU: Update dmar units devices list during hotplug Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 02/37] PNPACPI: Fix device ref leaking in acpi_pnp_match Yinghai Lu
2012-03-13 2:40 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 03/37] IOMMU: Fix tboot force iommu logic Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 04/37] x86, PCI: Fix non acpi path pci_sysdata leaking with release_fn Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 05/37] PCI: Separate out pci_assign_unassigned_bus_resources() Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 06/37] PCI: Move back pci_rescan_bus() Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 07/37] PCI: pci_bus_size_bridges() should not size own bridge Yinghai Lu
2012-03-13 2:47 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 08/37] PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources() Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 09/37] PCI, sysfs: Use device_type and attr_groups with pci dev Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 10/37] PCI, sysfs: create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-03-13 2:55 ` Bjorn Helgaas
2012-03-13 5:48 ` Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 11/37] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 12/37] PCI: Make pci_rescan_bus_bridge_resize() use pci_scan_bridge instead Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 13/37] PCI: Clean up rescan_bus_bridge_resize() Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 14/37] PCI: Rescan bus or bridge using callback method too Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 15/37] PCI, sysfs: Clean up rescan/remove with scheule_callback Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 16/37] PCI: Move pci_stop_and_remove_behind_bridge() down Yinghai Lu
2012-03-10 7:00 ` Yinghai Lu [this message]
2012-03-10 7:00 ` [PATCH v2 18/37] PCI: Use list_for_each_entry_safe instead of list_for_each_safe Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 19/37] PCI: Add pci_stop_and_remove_bus() Yinghai Lu
2012-03-12 15:58 ` Jiang Liu
2012-03-13 6:22 ` Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 20/37] PCI: Add pci bus removal through /sys/.../pci_bus/.../remove Yinghai Lu
2012-03-13 3:10 ` Bjorn Helgaas
2012-03-13 5:54 ` Yinghai Lu
2012-03-15 17:33 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 21/37] PCI, ACPI: Make acpi_pci_root_remove remove pci root bus too Yinghai Lu
2012-03-13 3:11 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 22/37] PCI, acpiphp: remove hot-add support of pci host bridge Yinghai Lu
2012-03-13 3:14 ` Bjorn Helgaas
2012-03-13 5:58 ` Yinghai Lu
2012-03-15 17:34 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 23/37] PCI, ACPI: Add pci_root_hp hot add hotplug notification Yinghai Lu
2012-03-13 3:22 ` Bjorn Helgaas
2012-03-13 6:03 ` Yinghai Lu
2012-03-15 17:47 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 24/37] PCI, ACPI: Add pci_root_hp hot removal notification support Yinghai Lu
2012-03-13 3:25 ` Bjorn Helgaas
2012-03-13 6:06 ` Yinghai Lu
2012-03-15 17:53 ` Bjorn Helgaas
2012-03-15 18:01 ` Yinghai Lu
2012-03-15 18:09 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 25/37] PCI, ACPI: Add alloc_acpi_hp_work() Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 26/37] PCI, acpiphp: Use acpi_hp_work Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 27/37] PCI, pci_root_hp: " Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 28/37] PCI, ACPI: Make kacpi_hotplug_wq static Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 29/37] PCI, ACPI: Add acpi_pci_root_rescan() Yinghai Lu
2012-03-13 3:33 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 30/37] PCI: Add __pci_scan_root_bus() that can skip bus_add Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 31/37] x86, PCI: add __pci_scan_root_bus_on_node() " Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 32/37] x86, PCI: add __pcibios_scan_specific_bus " Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 33/37] x86, PCI: Add pcibios_root_rescan() Yinghai Lu
2012-03-13 3:37 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 34/37] x86, PCI: Add arch version pci_root_rescan() Yinghai Lu
2012-03-13 3:40 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 35/37] PCI: Make /sys/bus/pci/rescan rescan root Yinghai Lu
2012-03-13 3:44 ` Bjorn Helgaas
2012-03-13 6:26 ` Yinghai Lu
2012-03-15 17:55 ` Bjorn Helgaas
2012-03-10 7:00 ` [PATCH v2 36/37] ACPI: Enable SCI_EMULATE to manually simulate physical hotplug testing Yinghai Lu
2012-03-10 7:00 ` [PATCH v2 37/37] PCI, sysfs: Prepare to kill pci device rescan Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331362837-10740-18-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).