path: root/arch/sparc/kernel
diff options
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-01-12 18:07:30 (GMT)
committerDavid S. Miller <davem@davemloft.net>2014-01-29 07:38:24 (GMT)
commit1b925b57e9e13ff9e61e410ced251905a83875c2 (patch)
tree6dc164fdcca37938da2001d3e1f74bef2bbd5c09 /arch/sparc/kernel
parent8b2abcbc5ef1c135b03c7009f98350dbad2fe293 (diff)
sparc: don't use module_init in non-modular pci.c code
The pci.o is built for SPARC64_PCI -- which is bool, and hence this code is either present or absent. It will never be modular, so using module_init as an alias for __initcall can be somewhat misleading. Fix this up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing. Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of device_initcall directly in this change means that the runtime impact is zero -- it will remain at level 6 in initcall ordering. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 7de8d1f..1555bbc 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -1005,6 +1005,5 @@ static int __init of_pci_slot_init(void)
return 0;

Privacy Policy