summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/time.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-11-08 00:35:33 +0100
committerStephen Warren <swarren@nvidia.com>2012-12-24 17:36:37 +0100
commit7704c095230e2e9863f3aacd0489a4b4cc00bf45 (patch)
tree0e8601120da6917b9f9ffabbaac8c84afa31ea99 /arch/arm/kernel/time.c
parentARM: samsung: register syscore_ops for timer resume directly (diff)
downloadlinux-7704c095230e2e9863f3aacd0489a4b4cc00bf45.tar.xz
linux-7704c095230e2e9863f3aacd0489a4b4cc00bf45.zip
ARM: remove struct sys_timer suspend and resume fields
These fields duplicate e.g. struct clock_event_device's suspend and resume fields, so remove them now that nothing is using them. The aim is to remove all fields from struct sys_timer except .init, then replace the ARM machine descriptor's .timer field with a .init_time function instead, and delete struct sys_timer. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/kernel/time.c')
-rw-r--r--arch/arm/kernel/time.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index ea36bfaeba91..0b51a7c88157 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -21,7 +21,6 @@
#include <linux/timex.h>
#include <linux/errno.h>
#include <linux/profile.h>
-#include <linux/syscore_ops.h>
#include <linux/timer.h>
#include <linux/irq.h>
@@ -119,39 +118,6 @@ int __init register_persistent_clock(clock_access_fn read_boot,
return -EINVAL;
}
-#if defined(CONFIG_PM) && !defined(CONFIG_GENERIC_CLOCKEVENTS)
-static int timer_suspend(void)
-{
- if (system_timer->suspend)
- system_timer->suspend();
-
- return 0;
-}
-
-static void timer_resume(void)
-{
- if (system_timer->resume)
- system_timer->resume();
-}
-#else
-#define timer_suspend NULL
-#define timer_resume NULL
-#endif
-
-static struct syscore_ops timer_syscore_ops = {
- .suspend = timer_suspend,
- .resume = timer_resume,
-};
-
-static int __init timer_init_syscore_ops(void)
-{
- register_syscore_ops(&timer_syscore_ops);
-
- return 0;
-}
-
-device_initcall(timer_init_syscore_ops);
-
void __init time_init(void)
{
system_timer = machine_desc->timer;