OSDN Git Service

PCI: pciehp: Remove pci_configure_slot() usage
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 28 Aug 2014 18:13:51 +0000 (12:13 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 13 Sep 2014 02:09:47 +0000 (20:09 -0600)
We now configure each PCI device as it is enumerated, in pci_device_add(),
so remove the configuration done in pciehp.

That configuration, in pci_configure_device(), does not include the
MPS/MRRS configuration done by pcie_bus_configure_settings(), so keep
that here.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
drivers/pci/hotplug/pciehp_pci.c

index b668127..9e69403 100644 (file)
@@ -65,10 +65,7 @@ int pciehp_configure_device(struct slot *p_slot)
                        pci_hp_add_bridge(dev);
 
        pci_assign_unassigned_bridge_resources(bridge);
-
-       list_for_each_entry(dev, &parent->devices, bus_list)
-               pci_configure_slot(dev);
-
+       pcie_bus_configure_settings(parent);
        pci_bus_add_devices(parent);
 
  out: