summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-06-04 12:34:15 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-04 07:46:10 -0700
commit1605abfffe331b3d9f845a456e7762f1bf53d973 (patch)
tree583b187e5eaad5628dbb365d9e3b4de42a4dcf65
parent3de0ef8d0d3350964720cad2a0a72984f1bb81ba (diff)
clocksource: versatile: Use sched_clock_register()
The newly merged versatile sched clock support uses a deprecated interface. Of course that patch got routed through the ARM tree instead of going through the relevant maintainer tree. Use the proper interface so we can get rid of the cruft. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/clocksource/versatile.c6
1 files changed, 3 insertions, 3 deletions
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);