Commit 35009c80 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI / utils: Introduce acpi_dev_hid_uid_match() helper 



There are users outside of ACPI realm which reimplementing the comparator
function to check if the given device matches to given HID and UID.

For better utilization, introduce a helper for everyone to use.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.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 a814dcc2

drivers/acpi/utils.c

+25 −0
Original line number Diff line number Diff line
@@ -701,6 +701,31 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs) 
}

EXPORT_SYMBOL(acpi_check_dsm);



/**

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

 */

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;



	if (!uid2)

		return true;



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

}

EXPORT_SYMBOL(acpi_dev_hid_uid_match);



/**

 * acpi_dev_found - Detect presence of a given ACPI device in the namespace.

 * @hid: Hardware ID of the device.

include/acpi/acpi_bus.h

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

}



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



struct acpi_device *

acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv);

include/linux/acpi.h

+8 −0
Original line number Diff line number Diff line
@@ -678,6 +678,14 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) 
	return false;

}



struct acpi_device;



static inline bool

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

{

	return false;

}



static inline struct acpi_device *

acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv)

{