Merge branches 'pm-core' and 'pm-domains'

Browse source

* pm-core:
  PM / sleep: Drop unused `info' variable
  PM / Runtime: Move ignore_children flag under CONFIG_PM
  PM / Runtime: Fix error path in pm_runtime_force_resume()

* pm-domains:
  PM / Domains: Drop unnecessary wakeup code from pm_genpd_prepare()
  PM / Domains: Remove redundant pm_runtime_get|put*() in pm_genpd_prepare()
  PM / Domains: Remove ->save|restore_state() callbacks
  PM / Domains: Rename pm_genpd_runtime_suspend|resume()
  PM / Domains: Rename stop_ok to suspend_ok for the genpd governor

...

This commit is contained in:

Rafael J. Wysocki 2016-05-16 14:31:29 +02:00

parent 7777c2785b fba1fbf563 164a2159a2

commit aa24781b1c

9 changed files with 91 additions and 121 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

include/linux/device.h

View file

2

include/linux/pm.h

View file

6

include/linux/pm_domain.h

View file

6

include/linux/pm_runtime.h

View file