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 /drivers/clocksource/bcm2835_timer.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 'drivers/clocksource/bcm2835_timer.c')
-rw-r--r-- | drivers/clocksource/bcm2835_timer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index bc19f12c20ce..7f796d8f7505 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c | |||
@@ -101,7 +101,7 @@ static struct of_device_id bcm2835_time_match[] __initconst = { | |||
101 | {} | 101 | {} |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static void __init bcm2835_time_init(void) | 104 | void __init bcm2835_timer_init(void) |
105 | { | 105 | { |
106 | struct device_node *node; | 106 | struct device_node *node; |
107 | void __iomem *base; | 107 | void __iomem *base; |
@@ -155,7 +155,3 @@ static void __init bcm2835_time_init(void) | |||
155 | 155 | ||
156 | pr_info("bcm2835: system timer (irq = %d)\n", irq); | 156 | pr_info("bcm2835: system timer (irq = %d)\n", irq); |
157 | } | 157 | } |
158 | |||
159 | struct sys_timer bcm2835_timer = { | ||
160 | .init = bcm2835_time_init, | ||
161 | }; | ||