summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-07-06 19:24:06 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-07-06 19:24:06 +0200
commit2e178ee13b02d95c7380f6a21149de535ccdfc7f (patch)
tree4668a11501c8a0a1f503d4bfa2f508e9963441b5 /drivers
parentb5539eb5ee70257520e40bb636a295217c329a50 (diff)
parent86fca926c042138c7defc94e1b55b5f29ca4fa13 (diff)
parent59e8d4bb8d485a3c125dc1c66439dde589b9d9cd (diff)
Merge branches 'acpi-bus' and 'acpi-scan'
Merge additional ACPI device enumeration code changes for 6.5-rc1. - Make acpi_companion_match() return a const pointer and update its callers accordingly (Andy Shevchenko). - Move the extern declaration of the acpi_root variable to a header file so as to address a compiler warning (Andy Shevchenko). - Address compiler warnings in the ACPI device enumeration code by adding a missing header file include to it (Ben Dooks). - Refine the SMB0001 quirk in the ACPI device enumeration code so as to address an i2c-scmi driver regression (Andy Shevchenko). - Clean up two pieces of the ACPI device enumeration code (Andy Shevchenko). * acpi-bus: ACPI: bus: Constify acpi_companion_match() returned value * acpi-scan: ACPI: scan: Use the acpi_match_acpi_device() helper ACPI: platform: Move SMB0001 HID to the header and reuse ACPI: platform: Ignore SMB0001 only when it has resources ACPI: bus: Introduce acpi_match_acpi_device() helper ACPI: scan: fix undeclared variable warnings by including sleep.h ACPI: scan: Move acpi_root to internal header