diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 16:04:49 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-10-26 16:04:49 +0300 |
commit | 3660e641ef68dc2503e3c3120814e80359e0e66b (patch) | |
tree | 58e006c797f83d5d2a5d3b57a772104a9a8c0365 /drivers/acpi/bus.c | |
parent | e8c3c7f97aa79c93713aecba5bdf83273076cf5d (diff) | |
parent | 470508f63ad2483b1ae82ed67cd504ad408b2a35 (diff) | |
download | linux-3660e641ef68dc2503e3c3120814e80359e0e66b.tar.xz |
Merge branch 'acpi-bus'
Merge ACPI bus type driver updates for 6.7-rc1:
- Add context argument to acpi_dev_install_notify_handler() (Rafael
Wysocki).
- Clarify ACPI bus concepts in the ACPI device enumeration
documentation (Rafael Wysocki).
* acpi-bus:
ACPI: bus: Add context argument to acpi_dev_install_notify_handler()
ACPI: docs: enumeration: Clarify ACPI bus concepts
Diffstat (limited to 'drivers/acpi/bus.c')
-rw-r--r-- | drivers/acpi/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index a4aa53b7e2bb..72e64c0718c9 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -556,12 +556,12 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device, int acpi_dev_install_notify_handler(struct acpi_device *adev, u32 handler_type, - acpi_notify_handler handler) + acpi_notify_handler handler, void *context) { acpi_status status; status = acpi_install_notify_handler(adev->handle, handler_type, - handler, adev); + handler, context); if (ACPI_FAILURE(status)) return -ENODEV; |