diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 22:35:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-06 22:35:13 -0400 |
| commit | 59df1c2bdecb0d1aaadfb8533df4bea528ee4952 (patch) | |
| tree | ded1e05c84622331dd6a61b24db31e9b920f6970 /drivers/acpi/power.c | |
| parent | c620f7bd0ba5c882b3e7fc199a8d5c2f6c2f5263 (diff) | |
| parent | 10b4768b27a0b8f9459570723ecb1809f4d707e0 (diff) | |
Merge tag 'acpi-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI updates from Rafael Wysocki:
"These rearrange the ACPI documentation by converting it to the .rst
format and splitting it into clear categories (admin guide, driver
API, firmware guide), switch over multiple users of a problematic
library function to a new better one, update the ACPICA code in the
kernel to a new upstream release, fix a few issues, improve power
device management diagnostics and do some cleanups.
Specifics:
- Convert the ACPI documentation in the kernel source tree to the
.rst format and split it into the admin guide, driver API and
firmware guide parts (Changbin Du).
- Add a PRP0001 usage example to the ACPI documentation (Thomas
Preston).
- Switch over the users of the acpi_dev_get_first_match_name()
library function which turned out to be problematic to a new,
better one called acpi_dev_get_first_match_dev() (Andy Shevchenko,
YueHaibing).
- Update the ACPICA code in the kernel to upstream release 20190405
including:
* Null pointer dereference check in acpi_ns_delete_node() (Erik
Schmauss).
* Multiple macro and function name changes (Bob Moore).
* Predefined operation region name fix (Erik Schmauss).
- Fix hibernation issue on systems using the Baytrail and Cherrytrail
Intel SoCs introduced during the 4.20 development cycle (Hans de
Goede).
- Add Sony VPCEH3U1E to the backlight quirk list (Zhang Rui).
- Fix button handling during system resume (Zhang Rui).
- Add a device PM diagnostic message (Rafael Wysocki).
- Clean up the code, comments and white space in multiple places
(Bjorn Helgaas, Gustavo Silva, Kefeng Wang)"
* tag 'acpi-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (53 commits)
Documentation: ACPI: move video_extension.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move ssdt-overlays.txt to admin-guide/acpi and convert to reST
Documentation: ACPI: move lpit.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move cppc_sysfs.txt to admin-guide/acpi and convert to reST
Documentation: ACPI: move apei/einj.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move apei/output_format.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move aml-debugger.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move method-tracing.txt to firmware-guide/acpi and convert to rsST
Documentation: ACPI: move debug.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move dsd/data-node-references.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move dsd/graph.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move acpi-lid.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move i2c-muxes.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move dsdt-override.txt to admin-guide/acpi and convert to reST
Documentation: ACPI: move initrd_table_override.txt to admin-guide/acpi and convert to reST
Documentation: ACPI: move method-customizing.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move gpio-properties.txt to firmware-guide/acpi and convert to reST
Documentation: ACPI: move DSD-properties-rules.txt to firmware-guide/acpi and covert to reST
Documentation: ACPI: move scan_handlers.txt to driver-api/acpi and convert to reST
Documentation: ACPI: move linuxized-acpica.txt to driver-api/acpi and convert to reST
...
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 665e93ca0b40..87db3e124725 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
| @@ -535,12 +535,12 @@ int acpi_device_sleep_wake(struct acpi_device *dev, | |||
| 535 | /* | 535 | /* |
| 536 | * Try to execute _DSW first. | 536 | * Try to execute _DSW first. |
| 537 | * | 537 | * |
| 538 | * Three agruments are needed for the _DSW object: | 538 | * Three arguments are needed for the _DSW object: |
| 539 | * Argument 0: enable/disable the wake capabilities | 539 | * Argument 0: enable/disable the wake capabilities |
| 540 | * Argument 1: target system state | 540 | * Argument 1: target system state |
| 541 | * Argument 2: target device state | 541 | * Argument 2: target device state |
| 542 | * When _DSW object is called to disable the wake capabilities, maybe | 542 | * When _DSW object is called to disable the wake capabilities, maybe |
| 543 | * the first argument is filled. The values of the other two agruments | 543 | * the first argument is filled. The values of the other two arguments |
| 544 | * are meaningless. | 544 | * are meaningless. |
| 545 | */ | 545 | */ |
| 546 | in_arg[0].type = ACPI_TYPE_INTEGER; | 546 | in_arg[0].type = ACPI_TYPE_INTEGER; |
