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, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index be2ee9bf5c6e..8280ebcaab9f 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -195,7 +195,7 @@ MACHINE_START(E330, "Toshiba e330")
         .handle_irq     = pxa25x_handle_irq,
         .fixup          = eseries_fixup,
         .init_machine   = e330_init,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .restart        = pxa_restart,
 MACHINE_END
 #endif
@@ -246,7 +246,7 @@ MACHINE_START(E350, "Toshiba e350")
         .handle_irq     = pxa25x_handle_irq,
         .fixup          = eseries_fixup,
         .init_machine   = e350_init,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .restart        = pxa_restart,
 MACHINE_END
 #endif
@@ -370,7 +370,7 @@ MACHINE_START(E400, "Toshiba e400")
         .handle_irq     = pxa25x_handle_irq,
         .fixup          = eseries_fixup,
         .init_machine   = e400_init,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .restart        = pxa_restart,
 MACHINE_END
 #endif
@@ -566,7 +566,7 @@ MACHINE_START(E740, "Toshiba e740")
         .handle_irq     = pxa25x_handle_irq,
         .fixup          = eseries_fixup,
         .init_machine   = e740_init,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .restart        = pxa_restart,
 MACHINE_END
 #endif
@@ -765,7 +765,7 @@ MACHINE_START(E750, "Toshiba e750")
         .handle_irq     = pxa25x_handle_irq,
         .fixup          = eseries_fixup,
         .init_machine   = e750_init,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .restart        = pxa_restart,
 MACHINE_END
 #endif
@@ -977,7 +977,7 @@ MACHINE_START(E800, "Toshiba e800")
         .handle_irq     = pxa25x_handle_irq,
         .fixup          = eseries_fixup,
         .init_machine   = e800_init,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .restart        = pxa_restart,
 MACHINE_END
 #endif