]> Git Repo - linux.git/commitdiff
Merge branches 'pm-opp', 'pm-qos', 'acpi-pm', 'pm-domains' and 'pm-tools'
authorRafael J. Wysocki <[email protected]>
Tue, 17 Sep 2019 07:49:19 +0000 (09:49 +0200)
committerRafael J. Wysocki <[email protected]>
Tue, 17 Sep 2019 07:49:19 +0000 (09:49 +0200)
* pm-opp:
  PM / OPP: Correct Documentation about library location
  opp: of: Support multiple suspend OPPs defined in DT
  dt-bindings: opp: Support multiple opp-suspend properties
  opp: core: add regulators enable and disable
  opp: Don't decrement uninitialized list_kref

* pm-qos:
  PM: QoS: Get rid of unused flags

* acpi-pm:
  ACPI: PM: Print debug messages on device power state changes

* pm-domains:
  PM / Domains: Verify PM domain type in dev_pm_genpd_set_performance_state()
  PM / Domains: Simplify genpd_lookup_dev()
  PM / Domains: Align in-parameter names for some genpd functions

* pm-tools:
  pm-graph: make setVal unbuffered again for python2 and python3
  cpupower: update German translation
  tools/power/cpupower: fix 64bit detection when cross-compiling
  cpupower: Add missing newline at end of file
  pm-graph v5.5

1  2  3  4  5  6 
drivers/acpi/device_pm.c

diff --combined drivers/acpi/device_pm.c
index 3f8958007a93b0c496d9159216dd8eb64f0ce5c4,f616b16c1f0be267aa5c116b14a35b095a5ac5d5,f616b16c1f0be267aa5c116b14a35b095a5ac5d5,4cb93d4f2ab6b7dca61f372c2f773dbb9da74c48,f616b16c1f0be267aa5c116b14a35b095a5ac5d5,f616b16c1f0be267aa5c116b14a35b095a5ac5d5..08bb9f2f2d2310367c9fde629aaa62e8955bf0e9
@@@@@@@ -166,6 -166,6 -166,6 -166,10 -166,6 -166,6 +166,10 @@@@@@@ int acpi_device_set_power(struct acpi_d
            || (state < ACPI_STATE_D0) || (state > ACPI_STATE_D3_COLD))
                return -EINVAL;
      
+++ ++  acpi_handle_debug(device->handle, "Power state change: %s -> %s\n",
+++ ++                    acpi_power_state_string(device->power.state),
+++ ++                    acpi_power_state_string(state));
+++ ++
        /* Make sure this is a valid target state */
      
        /* There is a special case for D0 addressed below. */
@@@@@@@ -497,8 -497,7 -497,7 -501,7 -497,7 -497,7 +501,8 @@@@@@@ acpi_status acpi_add_pm_notifier(struc
                goto out;
      
        mutex_lock(&acpi_pm_notifier_lock);
 -----  adev->wakeup.ws = wakeup_source_register(dev_name(&adev->dev));
 +++++  adev->wakeup.ws = wakeup_source_register(&adev->dev,
 +++++                                           dev_name(&adev->dev));
        adev->wakeup.context.dev = dev;
        adev->wakeup.context.func = func;
        adev->wakeup.flags.notifier_present = true;
This page took 0.108173 seconds and 4 git commands to generate.