diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-06-23 11:33:24 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-06-23 17:15:33 -0500 |
| commit | ab2b750cad0276cebbb9f765ca5652bd35dcb7af (patch) | |
| tree | 812d3a081793f96bfe5e12d0eb99ebd3d13228d6 /arch | |
| parent | 313cb90285d8715302d79069700d78770ee91e9a (diff) | |
| download | linux-stable-ab2b750cad0276cebbb9f765ca5652bd35dcb7af.tar.gz linux-stable-ab2b750cad0276cebbb9f765ca5652bd35dcb7af.tar.bz2 linux-stable-ab2b750cad0276cebbb9f765ca5652bd35dcb7af.zip | |
unicore32/PCI: Remove pci=firmware command line parameter handling
Remove support for the "pci=firmware" command line parameter, which was
way to keep the kernel from changing any PCI BAR assignments. This was
copied from ARM, but is not actually needed on unicore32.
The corresponding ARM support was removed by 903589ca7165 ("ARM: 8554/1:
kernel: pci: remove pci=firmware command line parameter handling").
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/unicore32/kernel/pci.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index d45fa5f3e9c4..62137d13c6f9 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -265,10 +265,8 @@ static int __init pci_common_init(void) pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq); - if (!pci_has_flag(PCI_PROBE_ONLY)) { - pci_bus_size_bridges(puv3_bus); - pci_bus_assign_resources(puv3_bus); - } + pci_bus_size_bridges(puv3_bus); + pci_bus_assign_resources(puv3_bus); pci_bus_add_devices(puv3_bus); return 0; } @@ -279,9 +277,6 @@ char * __init pcibios_setup(char *str) if (!strcmp(str, "debug")) { debug_pci = 1; return NULL; - } else if (!strcmp(str, "firmware")) { - pci_add_flags(PCI_PROBE_ONLY); - return NULL; } return str; } |