42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
|
From ee2a430c1691d0bac3098e8db3c29d8f023b04c2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||
|
|
Date: Fri, 29 Jan 2016 11:29:32 +0000
|
||
|
|
Subject: [PATCH 55/70] PCI: designware: Remove PCI_PROBE_ONLY handling
|
||
|
|
|
||
|
|
The PCIe designware host driver is not used in system configurations
|
||
|
|
requiring the PCI_PROBE_ONLY flag to be set to prevent resources
|
||
|
|
assignment, therefore the driver code handling the flag can be removed
|
||
|
|
from the kernel.
|
||
|
|
|
||
|
|
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
||
|
|
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||
|
|
Acked-by: Pratyush Anand <pratyush.anand@gmail.com>
|
||
|
|
Acked-by: Jingoo Han Jingoo Han <jingoohan1@gmail.com>
|
||
|
|
Cc: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Cc: Gabriele Paoloni <gabriele.paoloni@huawei.com>
|
||
|
|
Cc: Zhou Wang <wangzhou1@hisilicon.com>
|
||
|
|
---
|
||
|
|
drivers/pci/host/pcie-designware.c | 10 ++++------
|
||
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/pci/host/pcie-designware.c
|
||
|
|
+++ b/drivers/pci/host/pcie-designware.c
|
||
|
|
@@ -556,13 +556,11 @@ int dw_pcie_host_init(struct pcie_port *
|
||
|
|
pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
- if (!pci_has_flag(PCI_PROBE_ONLY)) {
|
||
|
|
- pci_bus_size_bridges(bus);
|
||
|
|
- pci_bus_assign_resources(bus);
|
||
|
|
+ pci_bus_size_bridges(bus);
|
||
|
|
+ pci_bus_assign_resources(bus);
|
||
|
|
|
||
|
|
- list_for_each_entry(child, &bus->children, node)
|
||
|
|
- pcie_bus_configure_settings(child);
|
||
|
|
- }
|
||
|
|
+ list_for_each_entry(child, &bus->children, node)
|
||
|
|
+ pcie_bus_configure_settings(child);
|
||
|
|
|
||
|
|
pci_bus_add_devices(bus);
|
||
|
|
return 0;
|