summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-02-16 02:05:44 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-02-16 02:05:44 +0900
commitbaf64abc468c7583592f67197ae23fa31414b4db (patch)
tree74a7d50562bc716810779cc05ed4bec70d780d5e
parenteeee27531c8c40ff4226eec2f8bea21e868ed4b6 (diff)
downloadlinux-stable-baf64abc468c7583592f67197ae23fa31414b4db.tar.gz
linux-stable-baf64abc468c7583592f67197ae23fa31414b4db.tar.bz2
linux-stable-baf64abc468c7583592f67197ae23fa31414b4db.zip
ARM: S3C64XX: mach-crag6410-module.c is not modular
Despite the name mach-crag6410-module.c, the code is built for MACH_WLF_CRAGG_6410 -- 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. Cc: Ben Dooks <ben-linux@fluff.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: patches@opensource.wolfsonmicro.com Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c64xx/mach-crag6410-module.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index 7ccfef227c77..9c00d83f7151 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c
@@ -401,4 +401,4 @@ static int __init wlf_gf_module_register(void)
{
return i2c_add_driver(&wlf_gf_module_driver);
}
-module_init(wlf_gf_module_register);
+device_initcall(wlf_gf_module_register);