From 7a65a34fae03d364c9ed34cea83fb5b978e75f2a Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Fri, 22 Apr 2016 14:07:01 -0400 Subject: [PATCH] sh: make time.c explicitly non-modular The Makefile currently controlling compilation of this code is: obj-y := debugtraps.o dma-nommu.o dumpstack.o \ [...] syscalls_$(BITS).o time.o topology.o traps.o \ traps_$(BITS).o unwinder.o ....meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular code, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Yoshinori Sato Cc: Rich Felker Cc: Paul Gortmaker Cc: linux-sh@vger.kernel.org Signed-off-by: Paul Gortmaker Signed-off-by: Rich Felker --- arch/sh/kernel/time.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index d6d0a986c6e9..bfe1de98d003 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -11,7 +11,6 @@ * for more details. */ #include -#include #include #include #include @@ -83,7 +82,7 @@ static int __init rtc_generic_init(void) return PTR_ERR_OR_ZERO(pdev); } -module_init(rtc_generic_init); +device_initcall(rtc_generic_init); void (*board_time_init)(void); -- 2.39.2