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>

15 files changed, 15 insertions, 21 deletions

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 9a23739f7026..b38d2525d5db 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -621,7 +621,7 @@ MACHINE_START(ASSABET, "Intel-Assabet")
         .map_io         = assabet_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = assabet_init,
         .init_late      = sa11x0_init_late,
 #ifdef CONFIG_SA1111
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index b2dadf3ea3df..63361b6d04e9 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -336,7 +336,7 @@ MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
         .init_late      = sa11x0_init_late,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
 #ifdef CONFIG_SA1111
         .dma_zone_size  = SZ_1M,
 #endif
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c
index 304bca4a07c0..2d25ececb415 100644
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
@@ -174,7 +174,7 @@ MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
         .map_io         = cerf_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = cerf_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = cerf_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 45f424f5fca6..612a45689770 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -399,7 +399,7 @@ MACHINE_START(COLLIE, "Sharp-Collie")
         .map_io         = collie_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = collie_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h
index a5b7c13da3e3..2abc6a1f6e86 100644
--- a/arch/arm/mach-sa1100/generic.h
+++ b/arch/arm/mach-sa1100/generic.h
@@ -4,9 +4,7 @@
  * Author: Nicolas Pitre
  */
 
-struct sys_timer;
-
-extern struct sys_timer sa1100_timer;
+extern void sa1100_timer_init(void);
 extern void __init sa1100_map_io(void);
 extern void __init sa1100_init_irq(void);
 extern void __init sa1100_init_gpio(void);
diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c
index e1571eab08ae..b8f2b151539b 100644
--- a/arch/arm/mach-sa1100/h3100.c
+++ b/arch/arm/mach-sa1100/h3100.c
@@ -108,7 +108,7 @@ MACHINE_START(H3100, "Compaq iPAQ H3100")
         .map_io         = h3100_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = h3100_mach_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index ba7a2901ab88..b8dc5bd22623 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -158,7 +158,7 @@ MACHINE_START(H3600, "Compaq iPAQ H3600")
         .map_io         = h3600_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = h3600_mach_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index d005939c41fc..643d5f2d9af9 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -229,7 +229,7 @@ MACHINE_START(HACKKIT, "HackKit Cpu Board")
         .map_io         = hackkit_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = hackkit_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 35cfc428b4d4..c0b1f5bafae4 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -346,7 +346,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720")
         .map_io         = jornada720_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = jornada720_mach_init,
         .init_late      = sa11x0_init_late,
 #ifdef CONFIG_SA1111
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c
index f69f78fc3ddd..a89917653884 100644
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
@@ -174,6 +174,6 @@ MACHINE_START(LART, "LART")
         .init_irq       = sa1100_init_irq,
         .init_machine   = lart_init,
         .init_late      = sa11x0_init_late,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .restart        = sa11x0_restart,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/nanoengine.c b/arch/arm/mach-sa1100/nanoengine.c
index 102e08f7b109..f1cb3784d525 100644
--- a/arch/arm/mach-sa1100/nanoengine.c
+++ b/arch/arm/mach-sa1100/nanoengine.c
@@ -110,7 +110,7 @@ MACHINE_START(NANOENGINE, "BSE nanoEngine")
         .map_io         = nanoengine_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = nanoengine_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c
index c51bb63f90fb..091261878eff 100644
--- a/arch/arm/mach-sa1100/pleb.c
+++ b/arch/arm/mach-sa1100/pleb.c
@@ -133,7 +133,7 @@ MACHINE_START(PLEB, "PLEB")
         .map_io         = pleb_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = pleb_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c
index 6460d25fbb88..c8866bce7386 100644
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
@@ -102,7 +102,7 @@ MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
         .map_io         = shannon_map_io,
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .init_machine   = shannon_init,
         .init_late      = sa11x0_init_late,
         .restart        = sa11x0_restart,
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 6d65f65fcb23..bcbc94540e45 100644
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -396,6 +396,6 @@ MACHINE_START(SIMPAD, "Simpad")
         .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
         .init_late      = sa11x0_init_late,
-        .timer          = &sa1100_timer,
+        .init_time      = sa1100_timer_init,
         .restart        = sa11x0_restart,
 MACHINE_END
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index 164f8276233c..934db6385cd6 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -117,7 +117,7 @@ static struct irqaction sa1100_timer_irq = {
         .dev_id         = &ckevt_sa1100_osmr0,
 };
 
-static void __init sa1100_timer_init(void)
+void __init sa1100_timer_init(void)
 {
         writel_relaxed(0, OIER);
         writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);
@@ -137,7 +137,3 @@ static void __init sa1100_timer_init(void)
                 clocksource_mmio_readl_up);
         clockevents_register_device(&ckevt_sa1100_osmr0);
 }
-
-struct sys_timer sa1100_timer = {
-        .init           = sa1100_timer_init,
-};