summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/time.c
diff options
context:
space:
mode:
authorStephen Warren2012-11-08 20:40:59 +0100
committerStephen Warren2012-12-24 17:36:38 +0100
commit6bb27d7349db51b50c40534710fe164ca0d58902 (patch)
tree8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/plat-samsung/time.c
parentARM: remove struct sys_timer suspend and resume fields (diff)
downloadkernel-qcow2-linux-6bb27d7349db51b50c40534710fe164ca0d58902.tar.gz
kernel-qcow2-linux-6bb27d7349db51b50c40534710fe164ca0d58902.tar.xz
kernel-qcow2-linux-6bb27d7349db51b50c40534710fe164ca0d58902.zip
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/plat-samsung/time.c')
-rw-r--r--arch/arm/plat-samsung/time.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/plat-samsung/time.c b/arch/arm/plat-samsung/time.c
index 773745a85f0f..73defd00c3e4 100644
--- a/arch/arm/plat-samsung/time.c
+++ b/arch/arm/plat-samsung/time.c
@@ -276,7 +276,7 @@ static struct syscore_ops s3c24xx_syscore_ops = {
.resume = s3c2410_timer_setup,
};
-static void __init s3c2410_timer_init(void)
+void __init s3c24xx_timer_init(void)
{
arch_gettimeoffset = s3c2410_gettimeoffset;
@@ -285,7 +285,3 @@ static void __init s3c2410_timer_init(void)
setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
register_syscore_ops(&s3c24xx_syscore_ops);
}
-
-struct sys_timer s3c24xx_timer = {
- .init = s3c2410_timer_init,
-};