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-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 7e81e9b586bf..8ddd69fdc937 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -221,7 +221,7 @@ MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
         .map_io         = kirkwood_map_io,
         .init_early     = kirkwood_init_early,
         .init_irq       = kirkwood_init_irq,
-        .timer          = &kirkwood_timer,
+        .init_time      = kirkwood_timer_init,
         .restart        = kirkwood_restart,
 MACHINE_END
 #endif
@@ -234,7 +234,7 @@ MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board")
         .map_io         = kirkwood_map_io,
         .init_early     = kirkwood_init_early,
         .init_irq       = kirkwood_init_irq,
-        .timer          = &kirkwood_timer,
+        .init_time      = kirkwood_timer_init,
         .restart        = kirkwood_restart,
 MACHINE_END
 #endif
@@ -247,7 +247,7 @@ MACHINE_START(OPENRD_ULTIMATE, "Marvell OpenRD Ultimate Board")
         .map_io         = kirkwood_map_io,
         .init_early     = kirkwood_init_early,
         .init_irq       = kirkwood_init_irq,
-        .timer          = &kirkwood_timer,
+        .init_time      = kirkwood_timer_init,
         .restart        = kirkwood_restart,
 MACHINE_END
 #endif