Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PCI: Fold stop and remove helpers into their callers

Browse Source 
pci_stop_bus_devices() is only two lines of code and is only called by
pci_stop_bus_device(), so I think it's easier to read if we just fold it
into the caller.  Similarly for __pci_remove_behind_bridge().

Tested-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
This commit is contained in:
Bjorn Helgaas 2012-08-17 11:25:01 -06:00
parent 66455f5472
commit 2ed168eeb3
1 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/pci/remove.c
View File

@ -78,7 +78,6 @@ 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_stop_bus_device(struct pci_dev *dev); static void pci_stop_bus_device(struct pci_dev *dev);
/** /**
@ -95,11 +94,14 @@ static void pci_stop_bus_device(struct pci_dev *dev);
*/ */
static 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 *bus = dev->subordinate;
struct pci_bus *b = dev->subordinate; struct pci_dev *child, *tmp;
__pci_remove_behind_bridge(dev); if (bus) {
pci_remove_bus(b); list_for_each_entry_safe(child, tmp, &bus->devices, bus_list)
__pci_remove_bus_device(child);
pci_remove_bus(bus);
dev->subordinate = NULL; dev->subordinate = NULL;
} }
@ -112,32 +114,6 @@ void pci_stop_and_remove_bus_device(struct pci_dev *dev)
__pci_remove_bus_device(dev); __pci_remove_bus_device(dev);
} }
static void __pci_remove_behind_bridge(struct pci_dev *dev)
{
struct pci_dev *child, *tmp;
if (dev->subordinate)
list_for_each_entry_safe(child, tmp,
&dev->subordinate->devices, bus_list)
__pci_remove_bus_device(child);
}
static void pci_stop_bus_devices(struct pci_bus *bus)
{
struct pci_dev *dev, *tmp;
/*
* VFs could be removed by pci_stop_and_remove_bus_device() in the
* pci_stop_bus_devices() code path for PF.
* aka, bus->devices get updated in the process.
* but VFs are inserted after PFs when SRIOV is enabled for PF,
* We can iterate the list backwards to get prev valid PF instead
* of removed VF.
*/
list_for_each_entry_safe_reverse(dev, tmp, &bus->devices, bus_list)
pci_stop_bus_device(dev);
}
/** /**
* pci_stop_bus_device - stop a PCI device and any children * pci_stop_bus_device - stop a PCI device and any children
* @dev: the device to stop * @dev: the device to stop
@ -148,8 +124,19 @@ static void pci_stop_bus_devices(struct pci_bus *bus)
*/ */
static void pci_stop_bus_device(struct pci_dev *dev) static void pci_stop_bus_device(struct pci_dev *dev)
{ {
if (dev->subordinate) struct pci_bus *bus = dev->subordinate;
pci_stop_bus_devices(dev->subordinate); struct pci_dev *child, *tmp;
/*
* Removing an SR-IOV PF device removes all the associated VFs,
* which will update the bus->devices list and confuse the
* iterator. Therefore, iterate in reverse so we remove the VFs
* first, then the PF.
*/
if (bus)
list_for_each_entry_safe_reverse(child, tmp,
&bus->devices, bus_list)
pci_stop_bus_device(child);
pci_stop_dev(dev); pci_stop_dev(dev);
} }