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>
This commit is contained in:
parent
07df7800c6
commit
19f48591e6
|
@ -116,7 +116,6 @@ might look something like:
|
|||
* arch/sh/boards/vapor/setup.c - Setup code for imaginary board
|
||||
*/
|
||||
#include <linux/init.h>
|
||||
#include <asm/rtc.h> /* for board_time_init() */
|
||||
|
||||
const char *get_system_type(void)
|
||||
{
|
||||
|
@ -132,13 +131,6 @@ int __init platform_setup(void)
|
|||
* this board.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Presume all FooTech boards have the same broken timer,
|
||||
* and also presume that we've defined foo_timer_init to
|
||||
* do something useful.
|
||||
*/
|
||||
board_time_init = foo_timer_init;
|
||||
|
||||
/* Start-up imaginary PCI ... */
|
||||
|
||||
/* And whatever else ... */
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Loading…
Reference in New Issue