diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-06-26 17:20:28 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-06-26 17:20:28 +0200 |
commit | 0586d26339ed4a84cfd60333daadb853663066fd (patch) | |
tree | 4bf9e4ac62776ab4102aec6ac24aac5d49489f93 /fs/bfs | |
parent | 9fc520a6fe14cb7fadd64718375da1572f5acf6a (diff) | |
parent | c31b3a1b004c1052c9bcc3f7534e393e205be1cb (diff) | |
parent | 365eac5ef2febeea75432b0c5257271fed93bcc5 (diff) |
Merge branches 'acpi-thermal' and 'acpi-button'
Merge ACPI thermal driver cleanups and ACPI button drivers rework for
6.5-rc1:
- Clean up the ACPI thermal driver and drop some dead or otherwise
unneded code from it (Rafael Wysocki).
- Rework the handling of notifications in the ACPI button drivers so
as to allow the common notification handling code for devices to be
simplified (Rafael Wysocki).
* acpi-thermal:
ACPI: thermal: Drop struct acpi_thermal_flags
ACPI: thermal: Drop struct acpi_thermal_state
ACPI: thermal: Eliminate struct acpi_thermal_state_flags
ACPI: thermal: Move acpi_thermal_driver definition
ACPI: thermal: Move symbol definitions to one place
ACPI: thermal: Drop redundant ACPI_TRIPS_REFRESH_DEVICES symbol
ACPI: thermal: Use BIT() macro for defining flags
* acpi-button:
ACPI: bus: Simplify installation and removal of notify callback
ACPI: tiny-power-button: Eliminate the driver notify callback
ACPI: button: Use different notify handlers for lid and buttons
ACPI: button: Eliminate the driver notify callback