diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-08-28 20:13:51 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-13 04:09:47 +0200 |
| commit | 77094fb342eda5fbfa5ef77dea8a423fa2b9d10b (patch) | |
| tree | 71a58221da9cacfb007facf82ded0aecbd18a45d /drivers/pci/hotplug/pciehp_pci.c | |
| parent | PCI: Add pci_configure_device() during enumeration (diff) | |
| download | linux-77094fb342eda5fbfa5ef77dea8a423fa2b9d10b.tar.xz linux-77094fb342eda5fbfa5ef77dea8a423fa2b9d10b.zip | |
PCI: pciehp: Remove pci_configure_slot() usage
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>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_pci.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_pci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index b66812703415..9e69403be632 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c @@ -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: |