diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-07 18:35:33 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:36:37 -0500 |
commit | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (patch) | |
tree | 0e8601120da6917b9f9ffabbaac8c84afa31ea99 /arch/arm/include/asm | |
parent | 656c669bc0cb9d2a621318b4b7300e8072930278 (diff) |
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/include/asm')
-rw-r--r-- | arch/arm/include/asm/mach/time.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h index cac8d9c7d5d9..d316d76ef242 100644 --- a/arch/arm/include/asm/mach/time.h +++ b/arch/arm/include/asm/mach/time.h | |||
@@ -17,15 +17,6 @@ | |||
17 | * Initialise the kernels jiffy timer source, claim interrupt | 17 | * Initialise the kernels jiffy timer source, claim interrupt |
18 | * using setup_irq. This is called early on during initialisation | 18 | * using setup_irq. This is called early on during initialisation |
19 | * while interrupts are still disabled on the local CPU. | 19 | * while interrupts are still disabled on the local CPU. |
20 | * - suspend | ||
21 | * Suspend the kernel jiffy timer source, if necessary. This | ||
22 | * is called with interrupts disabled, after all normal devices | ||
23 | * have been suspended. If no action is required, set this to | ||
24 | * NULL. | ||
25 | * - resume | ||
26 | * Resume the kernel jiffy timer source, if necessary. This | ||
27 | * is called with interrupts disabled before any normal devices | ||
28 | * are resumed. If no action is required, set this to NULL. | ||
29 | * - offset | 20 | * - offset |
30 | * Return the timer offset in microseconds since the last timer | 21 | * Return the timer offset in microseconds since the last timer |
31 | * interrupt. Note: this must take account of any unprocessed | 22 | * interrupt. Note: this must take account of any unprocessed |
@@ -33,8 +24,6 @@ | |||
33 | */ | 24 | */ |
34 | struct sys_timer { | 25 | struct sys_timer { |
35 | void (*init)(void); | 26 | void (*init)(void); |
36 | void (*suspend)(void); | ||
37 | void (*resume)(void); | ||
38 | }; | 27 | }; |
39 | 28 | ||
40 | extern void timer_tick(void); | 29 | extern void timer_tick(void); |