Commit a3a62ca2 authored by Raag Jadav's avatar Raag Jadav Committed by Rafael J. Wysocki
Browse files

ACPI: utils: Introduce acpi_dev_uid_match() for matching _UID 



Introduce acpi_dev_uid_match() helper that matches the device with
supplied _UID string.

Signed-off-by: default avatarRaag Jadav <raag.jadav@intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bb3dcf0c

drivers/acpi/utils.c

+27 −4
Original line number Diff line number Diff line
@@ -768,20 +768,43 @@ 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.

 * Returns true if matches.

 * 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);

	const char *uid1 = acpi_device_uid(adev);



	if (strcmp(hid1, hid2))

		return false;
@@ -789,7 +812,7 @@ bool acpi_dev_hid_uid_match(struct acpi_device *adev, 
	if (!uid2)

		return true;



	return uid1 && !strcmp(uid1, uid2);

	return acpi_dev_uid_match(adev, uid2);

}

EXPORT_SYMBOL(acpi_dev_hid_uid_match);

include/acpi/acpi_bus.h

+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) 
		adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set);

}



bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2);

bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2);

int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer);

include/linux/acpi.h

+5 −0
Original line number Diff line number Diff line
@@ -787,6 +787,11 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) 


struct acpi_device;



static inline bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2)

{

	return false;

}



static inline bool

acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2)

{