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>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-ks8695/board-sg.c b/arch/arm/mach-ks8695/board-sg.c
index f35b98b5bf37..fdf2352d2cf8 100644
--- a/arch/arm/mach-ks8695/board-sg.c
+++ b/arch/arm/mach-ks8695/board-sg.c
@@ -91,7 +91,7 @@ MACHINE_START(LITE300, "SecureComputing/SG300")
         .map_io         = ks8695_map_io,
         .init_irq       = ks8695_init_irq,
         .init_machine   = sg_init,
-        .timer          = &ks8695_timer,
+        .init_time      = ks8695_timer_init,
         .restart        = ks8695_restart,
 MACHINE_END
 #endif
@@ -103,7 +103,7 @@ MACHINE_START(SG310, "McAfee/SG310")
         .map_io         = ks8695_map_io,
         .init_irq       = ks8695_init_irq,
         .init_machine   = sg_init,
-        .timer          = &ks8695_timer,
+        .init_time      = ks8695_timer_init,
         .restart        = ks8695_restart,
 MACHINE_END
 #endif
@@ -115,7 +115,7 @@ MACHINE_START(SE4200, "SecureComputing/SE4200")
         .map_io         = ks8695_map_io,
         .init_irq       = ks8695_init_irq,
         .init_machine   = sg_init,
-        .timer          = &ks8695_timer,
+        .init_time      = ks8695_timer_init,
         .restart        = ks8695_restart,
 MACHINE_END
 #endif