diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 14:40:59 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:36:38 -0500 |
commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-shark/core.c | |
parent | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-shark/core.c')
-rw-r--r-- | arch/arm/mach-shark/core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c index 9ad2e9737fb5..b63dec848195 100644 --- a/arch/arm/mach-shark/core.c +++ b/arch/arm/mach-shark/core.c | |||
@@ -128,10 +128,6 @@ static void __init shark_timer_init(void) | |||
128 | setup_irq(IRQ_TIMER, &shark_timer_irq); | 128 | setup_irq(IRQ_TIMER, &shark_timer_irq); |
129 | } | 129 | } |
130 | 130 | ||
131 | static struct sys_timer shark_timer = { | ||
132 | .init = shark_timer_init, | ||
133 | }; | ||
134 | |||
135 | static void shark_init_early(void) | 131 | static void shark_init_early(void) |
136 | { | 132 | { |
137 | disable_hlt(); | 133 | disable_hlt(); |
@@ -142,7 +138,7 @@ MACHINE_START(SHARK, "Shark") | |||
142 | .atag_offset = 0x3000, | 138 | .atag_offset = 0x3000, |
143 | .init_early = shark_init_early, | 139 | .init_early = shark_init_early, |
144 | .init_irq = shark_init_irq, | 140 | .init_irq = shark_init_irq, |
145 | .timer = &shark_timer, | 141 | .init_time = shark_timer_init, |
146 | .dma_zone_size = SZ_4M, | 142 | .dma_zone_size = SZ_4M, |
147 | .restart = shark_restart, | 143 | .restart = shark_restart, |
148 | MACHINE_END | 144 | MACHINE_END |