Merge branch 'pm-sleep'

* pm-sleep:
  freezer: Fix typo in freezable_schedule_timeout() comment
  PM / s2idle: Clear the events_check_enabled flag
  PM / sleep: Remove pm_complete_with_resume_check()
  PM: ARM: locomo: Drop suspend and resume bus type callbacks
  PM: Use a more common logging style
  PM: Document rules on using pm_runtime_resume() in system suspend callbacks
This commit is contained in:
Rafael J. Wysocki 2017-11-13 01:41:20 +01:00
commit 05d658b5b5
10 changed files with 103 additions and 143 deletions

View file

@ -182,7 +182,7 @@ static inline void freezable_schedule_unsafe(void)
}
/*
* Like freezable_schedule_timeout(), but should not block the freezer. Do not
* Like schedule_timeout(), but should not block the freezer. Do not
* call this with locks held.
*/
static inline long freezable_schedule_timeout(long timeout)