diff options
| author | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2016-01-29 11:29:31 +0000 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-05 14:22:41 -0600 |
| commit | 3487c65659088c8205d8ab726b45469912271bbd (patch) | |
| tree | 5a56e81b1c5503df524300a285bf71c53cf89a9c /drivers/pci/host/pcie-rcar.c | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| download | op-kernel-dev-3487c65659088c8205d8ab726b45469912271bbd.zip op-kernel-dev-3487c65659088c8205d8ab726b45469912271bbd.tar.gz | |
PCI: rcar: Remove PCI_PROBE_ONLY handling
The PCIe rcar 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: Simon Horman <horms+renesas@verge.net.au>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Diffstat (limited to 'drivers/pci/host/pcie-rcar.c')
| -rw-r--r-- | drivers/pci/host/pcie-rcar.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 4edb518..3509218 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -390,9 +390,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) rcar_pcie_setup(&res, pcie); - /* Do not reassign resources if probe only */ - if (!pci_has_flag(PCI_PROBE_ONLY)) - pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS); + pci_add_flags(PCI_REASSIGN_ALL_RSRC | PCI_REASSIGN_ALL_BUS); if (IS_ENABLED(CONFIG_PCI_MSI)) bus = pci_scan_root_bus_msi(pcie->dev, pcie->root_bus_nr, @@ -408,13 +406,11 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci); - 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); |
