diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-12-08 21:34:58 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-12-08 21:34:58 +0100 |
commit | 3814876467e7557ccb1eecc28cf7f68d029f445e (patch) | |
tree | 9955c500b9bd0aadc6bd97129aea19c6dd066e7d /drivers/acpi/utils.c | |
parent | ACPI: utils: Fix error path in acpi_evaluate_reference() (diff) | |
parent | perf: arm_cspmu: drop redundant acpi_dev_uid_to_integer() (diff) | |
download | linux-3814876467e7557ccb1eecc28cf7f68d029f445e.tar.xz linux-3814876467e7557ccb1eecc28cf7f68d029f445e.zip |
Merge back earlier acpi-utils material for v6.8.
Diffstat (limited to 'drivers/acpi/utils.c')
-rw-r--r-- | drivers/acpi/utils.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 62944e35fcee..3dbc5eea0e17 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -825,54 +825,6 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs) EXPORT_SYMBOL(acpi_check_dsm); /** - * acpi_dev_uid_match - Match device by supplied UID - * @adev: ACPI device to match. - * @uid2: Unique ID of the device. - * - * Matches UID in @adev with given @uid2. - * - * Returns: - * - %true if matches. - * - %false otherwise. - */ -bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2) -{ - const char *uid1 = acpi_device_uid(adev); - - return uid1 && uid2 && !strcmp(uid1, uid2); -} -EXPORT_SYMBOL_GPL(acpi_dev_uid_match); - -/** - * acpi_dev_hid_uid_match - Match device by supplied HID and UID - * @adev: ACPI device to match. - * @hid2: Hardware ID of the device. - * @uid2: Unique ID of the device, pass NULL to not check _UID. - * - * Matches HID and UID in @adev with given @hid2 and @uid2. Absence of @uid2 - * will be treated as a match. If user wants to validate @uid2, it should be - * done before calling this function. - * - * Returns: - * - %true if matches or @uid2 is NULL. - * - %false otherwise. - */ -bool acpi_dev_hid_uid_match(struct acpi_device *adev, - const char *hid2, const char *uid2) -{ - const char *hid1 = acpi_device_hid(adev); - - if (strcmp(hid1, hid2)) - return false; - - if (!uid2) - return true; - - return acpi_dev_uid_match(adev, uid2); -} -EXPORT_SYMBOL(acpi_dev_hid_uid_match); - -/** * acpi_dev_uid_to_integer - treat ACPI device _UID as integer * @adev: ACPI device to get _UID from * @integer: output buffer for integer |