diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-04-20 18:46:39 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-12-18 18:13:04 +0300 |
| commit | 19f48591e67c83e74e1b612f180b96ce7f1eaf85 (patch) | |
| tree | 1c2d16b5e92b8eb2aefa47dcbf2d1393522adc25 /arch | |
| parent | 07df7800c6cd0bfc3bfcbfc5f12ebbd73423a5ec (diff) | |
| download | linux-19f48591e67c83e74e1b612f180b96ce7f1eaf85.tar.xz | |
sh: remove board_time_init() callback
The only remaining user of board_time_init() is the of-generic
machine, and that just calls the global timer_init() function.
Calling that one has no effect on non-DT platforms, so we can
simply call it unconditionally in place of board_time_init().
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/boards/of-generic.c | 8 | ||||
| -rw-r--r-- | arch/sh/include/asm/rtc.h | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/time.c | 5 |
3 files changed, 1 insertions, 13 deletions
diff --git a/arch/sh/boards/of-generic.c b/arch/sh/boards/of-generic.c index cde370cad4ae..6e9786548ac6 100644 --- a/arch/sh/boards/of-generic.c +++ b/arch/sh/boards/of-generic.c @@ -117,18 +117,10 @@ static void __init sh_of_mem_reserve(void) early_init_fdt_scan_reserved_mem(); } -static void __init sh_of_time_init(void) -{ - pr_info("SH generic board support: scanning for clocksource devices\n"); - timer_probe(); -} - static void __init sh_of_setup(char **cmdline_p) { struct device_node *root; - board_time_init = sh_of_time_init; - sh_mv.mv_name = "Unknown SH model"; root = of_find_node_by_path("/"); if (root) { diff --git a/arch/sh/include/asm/rtc.h b/arch/sh/include/asm/rtc.h index fe55fbb181aa..69dbae2949b0 100644 --- a/arch/sh/include/asm/rtc.h +++ b/arch/sh/include/asm/rtc.h @@ -3,7 +3,6 @@ #define _ASM_RTC_H void time_init(void); -extern void (*board_time_init)(void); #define RTC_CAP_4_DIGIT_YEAR (1 << 0) diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c index eb0a91270499..8a1c6c8ab4ec 100644 --- a/arch/sh/kernel/time.c +++ b/arch/sh/kernel/time.c @@ -22,8 +22,6 @@ #include <asm/clock.h> #include <asm/rtc.h> -void (*board_time_init)(void); - static void __init sh_late_time_init(void) { /* @@ -41,8 +39,7 @@ static void __init sh_late_time_init(void) void __init time_init(void) { - if (board_time_init) - board_time_init(); + timer_probe(); clk_init(); |