diff options
author | Magnus Damm <damm@opensource.se> | 2010-02-02 17:41:41 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-05 08:54:10 -0500 |
commit | c54a42b19fbaae4e9f212322ecca25a6bc95c1ba (patch) | |
tree | 2c929d3cde3b4ae864d5f5a50bdda688fd5293eb /kernel | |
parent | 17622339af2536b32cf29699ddd4ba0fe79a61d5 (diff) |
clocksource: add suspend callback
Add a clocksource suspend callback. This callback can be used by the
clocksource driver to shutdown and perform any kind of late suspend
activities even though the clocksource driver itself is a non-sysdev
driver.
One example where this is useful is to fix the sh_cmt.c platform driver
that today suspends using the platform bus and shuts down the clocksource
too early.
With this callback in place the sh_cmt driver will suspend using the
clocksource and clockevent hooks and leave the platform device pm
callbacks unused.
Signed-off-by: Magnus Damm <damm@opensource.se>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/clocksource.c | 12 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index 08adacb2a1ed..bd246660902c 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
@@ -441,6 +441,18 @@ static inline int clocksource_watchdog_kthread(void *data) { return 0; } | |||
441 | #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ | 441 | #endif /* CONFIG_CLOCKSOURCE_WATCHDOG */ |
442 | 442 | ||
443 | /** | 443 | /** |
444 | * clocksource_suspend - suspend the clocksource(s) | ||
445 | */ | ||
446 | void clocksource_suspend(void) | ||
447 | { | ||
448 | struct clocksource *cs; | ||
449 | |||
450 | list_for_each_entry_reverse(cs, &clocksource_list, list) | ||
451 | if (cs->suspend) | ||
452 | cs->suspend(cs); | ||
453 | } | ||
454 | |||
455 | /** | ||
444 | * clocksource_resume - resume the clocksource(s) | 456 | * clocksource_resume - resume the clocksource(s) |
445 | */ | 457 | */ |
446 | void clocksource_resume(void) | 458 | void clocksource_resume(void) |
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 7faaa32fbf4f..843d8a711b16 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -622,6 +622,7 @@ static int timekeeping_suspend(struct sys_device *dev, pm_message_t state) | |||
622 | write_sequnlock_irqrestore(&xtime_lock, flags); | 622 | write_sequnlock_irqrestore(&xtime_lock, flags); |
623 | 623 | ||
624 | clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL); | 624 | clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL); |
625 | clocksource_suspend(); | ||
625 | 626 | ||
626 | return 0; | 627 | return 0; |
627 | } | 628 | } |