diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 11:30:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-30 11:30:16 -0700 |
| commit | 527953ef7125078cd43ccfbed042d60199842b31 (patch) | |
| tree | 261744987bb2e856951c25ae8d6b53896428fcd9 /include/linux/acpi.h | |
| parent | 2c5ca23f7414eb2c782f945aa417cfab7b5c88dd (diff) | |
| parent | 4a577fca503a63442928ff4cec06c1136ea9b53e (diff) | |
Merge tag 'acpi-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"These add some new device IDs, update a few drivers (processor,
battery, backlight) and clean up code in a few places.
Specifics:
- Add Meteor Lake ACPI IDs for DPTF devices (Sumeet Pawnikar)
- Rearrange find_child_checks() to simplify code (Rafael Wysocki)
- Use memremap() to map the UCSI mailbox that is always in main
memory and drop acpi_release_memory() that has no more users
(Heikki Krogerus, Dan Carpenter)
- Make max_cstate/nocst/bm_check_disable processor module parameters
visible in sysfs (Yajun Deng)
- Fix typo in the CPPC driver (Julia Lawall)
- Make the ACPI battery driver show the "not-charging" status by
default unless "charging" or "full" is directly indicated (Werner
Sembach)
- Improve the PM notifier in the ACPI backlight driver (Zhang Rui)
- Clean up some white space in the ACPI code (Ian Cowan)"
* tag 'acpi-5.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
usb: typec: ucsi: acpi: fix a NULL vs IS_ERR() check in probe
ACPI: DPTF: Support Meteor Lake
ACPI: CPPC: fix typo in comment
ACPI: video: improve PM notifer callback
ACPI: clean up white space in a few places for consistency
ACPI: glue: Rearrange find_child_checks()
ACPI: processor: idle: Expose max_cstate/nocst/bm_check_disable read-only in sysfs
ACPI: battery: Make "not-charging" the default on no charging or full info
ACPI: OSL: Remove the helper for deactivating memory region
usb: typec: ucsi: acpi: Map the mailbox with memremap()
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index f3fdfd784a6c..4f82a5bc6d98 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -520,9 +520,6 @@ int acpi_check_resource_conflict(const struct resource *res); int acpi_check_region(resource_size_t start, resource_size_t n, const char *name); -acpi_status acpi_release_memory(acpi_handle handle, struct resource *res, - u32 level); - int acpi_resources_are_enforced(void); #ifdef CONFIG_HIBERNATION |