diff options
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/clksrc-of.c | 2 | ||||
| -rw-r--r-- | drivers/clocksource/versatile.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clocksource/clksrc-of.c b/drivers/clocksource/clksrc-of.c index ae2e4278c42a..0093a8e49e14 100644 --- a/drivers/clocksource/clksrc-of.c +++ b/drivers/clocksource/clksrc-of.c @@ -27,7 +27,7 @@ void __init clocksource_of_init(void) { struct device_node *np; const struct of_device_id *match; - clocksource_of_init_fn init_func; + of_init_fn_1 init_func; unsigned clocksources = 0; for_each_matching_node_and_match(np, __clksrc_of_table, &match) { diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c index e4c50ad2f9d9..2798e7492234 100644 --- a/drivers/clocksource/versatile.c +++ b/drivers/clocksource/versatile.c @@ -20,7 +20,7 @@ static void __iomem *versatile_sys_24mhz; -static u32 notrace versatile_sys_24mhz_read(void) +static u64 notrace versatile_sys_24mhz_read(void) { return readl(versatile_sys_24mhz); } @@ -34,7 +34,7 @@ static void __init versatile_sched_clock_init(struct device_node *node) versatile_sys_24mhz = base + SYS_24MHZ; - setup_sched_clock(versatile_sys_24mhz_read, 32, 24000000); + sched_clock_register(versatile_sys_24mhz_read, 32, 24000000); } CLOCKSOURCE_OF_DECLARE(versatile, "arm,vexpress-sysreg", - versatile_sched_clock_init); + versatile_sched_clock_init); |
