hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI: acpiphp: Stop disabling bridges on remove 

acpiphp_disable_slot() turns off power to the slot immediately after
calling disable_device(), so there's no point in disabling any bridges
below the slot: we're about to turn them off anyway.

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 09:56:14 -06:00
parent 0d7614f09c
commit 57fd9a4df5
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/pci/hotplug/acpiphp_glue.c
View File

@ -869,17 +869,6 @@ static int __ref enable_device(struct acpiphp_slot *slot)
return retval; return retval;
} }
static void disable_bridges(struct pci_bus *bus)
{
struct pci_dev *dev;
list_for_each_entry(dev, &bus->devices, bus_list) {
if (dev->subordinate) {
disable_bridges(dev->subordinate);
pci_disable_device(dev);
}
}
}
/* return first device in slot, acquiring a reference on it */ /* return first device in slot, acquiring a reference on it */
static struct pci_dev *dev_in_slot(struct acpiphp_slot *slot) static struct pci_dev *dev_in_slot(struct acpiphp_slot *slot)
{ {
@ -932,10 +921,6 @@ static int disable_device(struct acpiphp_slot *slot)
*/ */
while ((pdev = dev_in_slot(slot))) { while ((pdev = dev_in_slot(slot))) {
pci_stop_bus_device(pdev); pci_stop_bus_device(pdev);
if (pdev->subordinate) {
disable_bridges(pdev->subordinate);
pci_disable_device(pdev);
}
__pci_remove_bus_device(pdev); __pci_remove_bus_device(pdev);
pci_dev_put(pdev); pci_dev_put(pdev);
} }