]> git.ipfire.org Git - thirdparty/linux.git/commit
ACPI: bus: Align acpi_device_get_match_data() with driver match order
authorKartik Rajput <kkartik@nvidia.com>
Wed, 14 Jan 2026 08:23:06 +0000 (13:53 +0530)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Jan 2026 16:15:50 +0000 (17:15 +0100)
commit8567b5733715e959474851dbec666aafcdba86e8
treed1d28b4e5dfbaa245e7b176a01a9e949b3025dbf
parentb2f90ef5ded439cb01fc076a6f66c5cde5e633c5
ACPI: bus: Align acpi_device_get_match_data() with driver match order

During pre-production development, drivers may provide both ACPI and OF
match tables while a formal ACPI HID for the device is not yet
allocated. Such devices are enumerated via PRP0001. In this case,
acpi_device_get_match_data() consults only the driver’s ACPI match table
and returns NULL, even though the device was successfully matched via
PRP0001.

This behavior also risks breaking existing PRP0001 setups if a driver
later gains an ACPI HID, as the presence of an ACPI match table changes
the match-data lookup path.

Make acpi_device_get_match_data() use the same precedence as driver
matching by using __acpi_match_device(). Return match data from the
acpi_id or of_id that was actually matched.

Remove now-unused acpi_of_device_get_match_data().

Signed-off-by: Kartik Rajput <kkartik@nvidia.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Link: https://patch.msgid.link/20260114082306.48119-1-kkartik@nvidia.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/bus.c