PCI: shpchp: Remove pci_configure_slot() usage
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 28 Aug 2014 18:18:37 +0000 (12:18 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Sat, 13 Sep 2014 02:09:49 +0000 (20:09 -0600)
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>
drivers/pci/hotplug/shpchp_pci.c

index 469454e0cc48d8eca080dc2f5035f87d83769f53..f8cd3a27e3515e630639e86a8e58478517f5ec2a 100644 (file)
@@ -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: