diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-05-01 20:05:50 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-06-16 14:12:31 -0400 |
commit | b205118bdb4b515b4b4f5058aa9f5a12668386c3 (patch) | |
tree | aadaab81cc51d817203acccdd5479c739f36814c /arch/sh | |
parent | 1b4d5beecbeb4608a0fdb77c3b8ba182f0cfb4b6 (diff) | |
download | linux-b205118bdb4b515b4b4f5058aa9f5a12668386c3.tar.gz linux-b205118bdb4b515b4b4f5058aa9f5a12668386c3.tar.bz2 linux-b205118bdb4b515b4b4f5058aa9f5a12668386c3.zip |
sh: don't use module_init in non-modular psw.c code
The psw.o is built for obj-y -- and hence this code is always
present. 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.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-landisk/psw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-landisk/psw.c b/arch/sh/boards/mach-landisk/psw.c index bef83522f958..5192b1f43ada 100644 --- a/arch/sh/boards/mach-landisk/psw.c +++ b/arch/sh/boards/mach-landisk/psw.c @@ -140,4 +140,4 @@ static int __init psw_init(void) { return platform_add_devices(psw_devices, ARRAY_SIZE(psw_devices)); } -module_init(psw_init); +device_initcall(psw_init); |