diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 14:40:59 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:36:38 -0500 |
commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-u300/timer.c | |
parent | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff) |
ARM: delete struct sys_timer
Now that the only field in struct sys_timer is .init, delete the struct,
and replace the machine descriptor .timer field with the initialization
function itself.
This will enable moving timer drivers into drivers/clocksource without
having to place a public prototype of each struct sys_timer object into
include/linux; the intent is to create a single of_clocksource_init()
function that determines which timer driver to initialize by scanning
the device dtree, much like the proposed irqchip_init() at:
http://www.spinics.net/lists/arm-kernel/msg203686.html
Includes mach-omap2 fixes from Igor Grinberg.
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-u300/timer.c')
-rw-r--r-- | arch/arm/mach-u300/timer.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c index 1da10e20e996..d9e73209c9b8 100644 --- a/arch/arm/mach-u300/timer.c +++ b/arch/arm/mach-u300/timer.c | |||
@@ -349,7 +349,7 @@ static u32 notrace u300_read_sched_clock(void) | |||
349 | /* | 349 | /* |
350 | * This sets up the system timers, clock source and clock event. | 350 | * This sets up the system timers, clock source and clock event. |
351 | */ | 351 | */ |
352 | static void __init u300_timer_init(void) | 352 | void __init u300_timer_init(void) |
353 | { | 353 | { |
354 | struct clk *clk; | 354 | struct clk *clk; |
355 | unsigned long rate; | 355 | unsigned long rate; |
@@ -413,11 +413,3 @@ static void __init u300_timer_init(void) | |||
413 | * used by hrtimers! | 413 | * used by hrtimers! |
414 | */ | 414 | */ |
415 | } | 415 | } |
416 | |||
417 | /* | ||
418 | * Very simple system timer that only register the clock event and | ||
419 | * clock source. | ||
420 | */ | ||
421 | struct sys_timer u300_timer = { | ||
422 | .init = u300_timer_init, | ||
423 | }; | ||