[PATCH 27/73] drivers/clk: don't use module_init in clk-nomadik.c which is non-modular
From: Mike Turquette <hidden>
Date: 2014-01-31 23:17:56
Also in:
linux-arch, lkml
Quoting Paul Gortmaker (2014-01-21 13:22:30)
The clk-nomadik.o is built for ARCH_NOMADIK -- 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: Mike Turquette <redacted> Cc: linux-arm-kernel at lists.infradead.org Signed-off-by: Paul Gortmaker <redacted>
Looks good to me. Regards, Mike
quoted hunk ↗ jump to hunk
--- drivers/clk/clk-nomadik.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c index 6a934a5..5be9b9f 100644 --- a/drivers/clk/clk-nomadik.c +++ b/drivers/clk/clk-nomadik.c@@ -500,8 +500,7 @@ static int __init nomadik_src_clk_init_debugfs(void) NULL, NULL, &nomadik_src_clk_debugfs_ops); return 0; } - -module_init(nomadik_src_clk_init_debugfs); +device_initcall(nomadik_src_clk_init_debugfs); #endif-- 1.8.4.1