Commit f474ba9d authored by Paul Burton's avatar Paul Burton Committed by Ralf Baechle

MIPS: PCI: Make pcibios_set_cache_line_size an initcall

In preparation for allowing configurations in which pcibios_init is not
included, make pcibios_set_cache_line_size an initcall. arch_initcall is
used such that it runs before the pcibios_init subsys_initcall for
platforms that continue to use it.
Signed-off-by: default avatarPaul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14342/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 88555b48
...@@ -220,7 +220,7 @@ void register_pci_controller(struct pci_controller *hose) ...@@ -220,7 +220,7 @@ void register_pci_controller(struct pci_controller *hose)
"Skipping PCI bus scan due to resource conflict\n"); "Skipping PCI bus scan due to resource conflict\n");
} }
static void __init pcibios_set_cache_line_size(void) static int __init pcibios_set_cache_line_size(void)
{ {
struct cpuinfo_mips *c = &current_cpu_data; struct cpuinfo_mips *c = &current_cpu_data;
unsigned int lsize; unsigned int lsize;
...@@ -238,14 +238,14 @@ static void __init pcibios_set_cache_line_size(void) ...@@ -238,14 +238,14 @@ static void __init pcibios_set_cache_line_size(void)
pci_dfl_cache_line_size = lsize >> 2; pci_dfl_cache_line_size = lsize >> 2;
pr_debug("PCI: pci_cache_line_size set to %d bytes\n", lsize); pr_debug("PCI: pci_cache_line_size set to %d bytes\n", lsize);
return 0;
} }
arch_initcall(pcibios_set_cache_line_size);
static int __init pcibios_init(void) static int __init pcibios_init(void)
{ {
struct pci_controller *hose; struct pci_controller *hose;
pcibios_set_cache_line_size();
/* Scan all of the recorded PCI controllers. */ /* Scan all of the recorded PCI controllers. */
list_for_each_entry(hose, &controllers, list) list_for_each_entry(hose, &controllers, list)
pcibios_scanbus(hose); pcibios_scanbus(hose);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment