diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-08-28 12:18:37 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-12 20:09:49 -0600 |
| commit | b40716630375ec1bf9fe0c3534da4329663c5459 (patch) | |
| tree | 28ead408ceb84c17410c6838e666714d8ae131ac | |
| parent | 77094fb342eda5fbfa5ef77dea8a423fa2b9d10b (diff) | |
| download | linux-b40716630375ec1bf9fe0c3534da4329663c5459.tar.gz linux-b40716630375ec1bf9fe0c3534da4329663c5459.tar.bz2 linux-b40716630375ec1bf9fe0c3534da4329663c5459.zip | |
PCI: shpchp: 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 shpchp.
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/shpchp_pci.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c index 469454e0cc48..f8cd3a27e351 100644 --- a/drivers/pci/hotplug/shpchp_pci.c +++ b/drivers/pci/hotplug/shpchp_pci.c @@ -69,13 +69,7 @@ int shpchp_configure_device(struct slot *p_slot) } pci_assign_unassigned_bridge_resources(bridge); - - list_for_each_entry(dev, &parent->devices, bus_list) { - if (PCI_SLOT(dev->devfn) != p_slot->device) - continue; - pci_configure_slot(dev); - } - + pcie_bus_configure_settings(parent); pci_bus_add_devices(parent); out: |