diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:34 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-26 15:40:34 -0600 |
| commit | 07f2daad094bc9e9770143cd2d619de24d84bb3e (patch) | |
| tree | 202f930177f85456a129cfb3f7b5abc9615d52a4 /arch/x86 | |
| parent | 1193725f543c92a77c73769bc2fbe48c53275f53 (diff) | |
| parent | 5895af79158a55562753f7f05762f3bd766d32b9 (diff) | |
| download | op-kernel-dev-07f2daad094bc9e9770143cd2d619de24d84bb3e.zip op-kernel-dev-07f2daad094bc9e9770143cd2d619de24d84bb3e.tar.gz | |
Merge branch 'pci/yijing-mps-v8' into next
* pci/yijing-mps-v8:
PCI: Warn if unsafe MPS settings detected
PCI: Fix MPS peer-to-peer DMA comment syntax
PCI: Don't restrict MPS for slots below Root Ports
PCI: Simplify MPS test for Downstream Port
PCI: Remove unnecessary check for pcie_get_mps() failure
PCI: Simplify pcie_bus_configure_settings() interface
PCI: Drop "PCI-E" prefix from Max Payload Size message
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/acpi.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index d641897..b30e937 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -568,13 +568,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) */ if (bus) { struct pci_bus *child; - list_for_each_entry(child, &bus->children, node) { - struct pci_dev *self = child->self; - if (!self) - continue; - - pcie_bus_configure_settings(child, self->pcie_mpss); - } + list_for_each_entry(child, &bus->children, node) + pcie_bus_configure_settings(child); } if (bus && node != -1) { |
