diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-08-28 14:13:51 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-12 22:09:47 -0400 |
| commit | 77094fb342eda5fbfa5ef77dea8a423fa2b9d10b (patch) | |
| tree | 71a58221da9cacfb007facf82ded0aecbd18a45d | |
| parent | 6cd33649fa83d97ba7b66f1d871a360e867c5220 (diff) | |
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>
| -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) | |||
| 65 | pci_hp_add_bridge(dev); | 65 | pci_hp_add_bridge(dev); |
| 66 | 66 | ||
| 67 | pci_assign_unassigned_bridge_resources(bridge); | 67 | pci_assign_unassigned_bridge_resources(bridge); |
| 68 | 68 | pcie_bus_configure_settings(parent); | |
| 69 | list_for_each_entry(dev, &parent->devices, bus_list) | ||
| 70 | pci_configure_slot(dev); | ||
| 71 | |||
| 72 | pci_bus_add_devices(parent); | 69 | pci_bus_add_devices(parent); |
| 73 | 70 | ||
| 74 | out: | 71 | out: |