From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 26 Oct 2023 13:04:49 +0000 (+0200)
Subject: Merge branch 'acpi-bus'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3660e641ef68dc2503e3c3120814e80359e0e66b;p=linux.git

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
---

3660e641ef68dc2503e3c3120814e80359e0e66b
diff --cc drivers/acpi/nfit/core.c
index 7d88db451cfbf,942b84d94078a..9923855377570
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@@ -3339,16 -3339,6 +3339,16 @@@ static int acpi_nfit_add(struct acpi_de
  	acpi_size sz;
  	int rc = 0;
  
 +	rc = acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,
- 					     acpi_nfit_notify);
++					     acpi_nfit_notify, adev);
 +	if (rc)
 +		return rc;
 +
 +	rc = devm_add_action_or_reset(dev, acpi_nfit_remove_notify_handler,
 +					adev);
 +	if (rc)
 +		return rc;
 +
  	status = acpi_get_table(ACPI_SIG_NFIT, 0, &tbl);
  	if (ACPI_FAILURE(status)) {
  		/* The NVDIMM root device allows OS to trigger enumeration of