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, 16 insertions, 23 deletions

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 95b5e102ceb1..e3742716cbaa 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -679,7 +679,7 @@ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM")
         .atag_offset    = 0x100,
         .map_io         = da830_evm_map_io,
         .init_irq       = cp_intc_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = da830_evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 0299915575a8..3b3356097bb0 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -1599,7 +1599,7 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM")
         .atag_offset    = 0x100,
         .map_io         = da850_evm_map_io,
         .init_irq       = cp_intc_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = da850_evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index cdf8d0746e79..147b8e1a4407 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -355,7 +355,7 @@ MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM")
         .atag_offset  = 0x100,
         .map_io       = dm355_evm_map_io,
         .init_irq     = davinci_irq_init,
-        .timer        = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = dm355_evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index d41954507fc2..dff4ddc5ef81 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -274,7 +274,7 @@ MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard")
         .atag_offset  = 0x100,
         .map_io       = dm355_leopard_map_io,
         .init_irq     = davinci_irq_init,
-        .timer        = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = dm355_leopard_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 5d49c75388ca..c2d4958a0cb6 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -616,7 +616,7 @@ MACHINE_START(DAVINCI_DM365_EVM, "DaVinci DM365 EVM")
         .atag_offset    = 0x100,
         .map_io         = dm365_evm_map_io,
         .init_irq       = davinci_irq_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = dm365_evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index f5e018de7fa5..e4a16f98e6a2 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -825,7 +825,7 @@ MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")
         .atag_offset  = 0x100,
         .map_io       = davinci_evm_map_io,
         .init_irq     = davinci_irq_init,
-        .timer        = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = davinci_evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 9211e8800c79..a9f2054c3e9b 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -818,7 +818,7 @@ MACHINE_START(DAVINCI_DM6467_EVM, "DaVinci DM646x EVM")
         .atag_offset  = 0x100,
         .map_io       = davinci_map_io,
         .init_irq     = davinci_irq_init,
-        .timer        = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
@@ -829,7 +829,7 @@ MACHINE_START(DAVINCI_DM6467TEVM, "DaVinci DM6467T EVM")
         .atag_offset  = 0x100,
         .map_io       = davinci_map_io,
         .init_irq     = davinci_irq_init,
-        .timer        = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = evm_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 43e4a0d663fa..b0df578bf744 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -570,7 +570,7 @@ MACHINE_START(MITYOMAPL138, "MityDSP-L138/MityARM-1808")
         .atag_offset    = 0x100,
         .map_io         = mityomapl138_map_io,
         .init_irq       = cp_intc_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = mityomapl138_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 3e3e3afebf88..1c98107527fa 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -237,7 +237,7 @@ MACHINE_START(NEUROS_OSD2, "Neuros OSD2")
         .atag_offset    = 0x100,
         .map_io          = davinci_ntosd2_map_io,
         .init_irq       = davinci_irq_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = davinci_ntosd2_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index dc1208e9e664..deb3922612b9 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -341,7 +341,7 @@ MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
         .atag_offset    = 0x100,
         .map_io         = omapl138_hawk_map_io,
         .init_irq       = cp_intc_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = omapl138_hawk_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 6957787fa7f3..739be7e738fe 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -155,7 +155,7 @@ MACHINE_START(SFFSDR, "Lyrtech SFFSDR")
         .atag_offset  = 0x100,
         .map_io       = davinci_sffsdr_map_io,
         .init_irq     = davinci_irq_init,
-        .timer        = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine = davinci_sffsdr_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/board-tnetv107x-evm.c b/arch/arm/mach-davinci/board-tnetv107x-evm.c
index be3099733b1f..4f416023d4e2 100644
--- a/arch/arm/mach-davinci/board-tnetv107x-evm.c
+++ b/arch/arm/mach-davinci/board-tnetv107x-evm.c
@@ -280,7 +280,7 @@ MACHINE_START(TNETV107X, "TNETV107X EVM")
         .atag_offset    = 0x100,
         .map_io         = tnetv107x_init,
         .init_irq       = cp_intc_init,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = tnetv107x_evm_board_init,
         .init_late      = davinci_init_late,
         .dma_zone_size  = SZ_128M,
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 37c27af18fa0..9a7c76efc8f8 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -56,7 +56,7 @@ static const char *da850_boards_compat[] __initdata = {
 DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x")
         .map_io         = da850_init,
         .init_irq       = da8xx_init_irq,
-        .timer          = &davinci_timer,
+        .init_time      = davinci_timer_init,
         .init_machine   = da850_init_machine,
         .dt_compat      = da850_boards_compat,
         .init_late      = davinci_init_late,
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index 046c7238a3d6..b124b77c90c5 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -15,9 +15,7 @@
 #include <linux/compiler.h>
 #include <linux/types.h>
 
-struct sys_timer;
-
-extern struct sys_timer davinci_timer;
+extern void davinci_timer_init(void);
 
 extern void davinci_irq_init(void);
 extern void __iomem *davinci_intc_base;
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 9847938785ca..bad361ec1666 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -337,7 +337,7 @@ static struct clock_event_device clockevent_davinci = {
 };
 
 
-static void __init davinci_timer_init(void)
+void __init davinci_timer_init(void)
 {
         struct clk *timer_clk;
         struct davinci_soc_info *soc_info = &davinci_soc_info;
@@ -410,11 +410,6 @@ static void __init davinci_timer_init(void)
                 timer32_config(&timers[i]);
 }
 
-struct sys_timer davinci_timer = {
-        .init   = davinci_timer_init,
-};
-
-
 /* reset board using watchdog timer */
 void davinci_watchdog_reset(struct platform_device *pdev)
 {