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

ACPI: bus: update acpi_dev_hid_uid_match() to support multiple types 



Now that we have _UID matching support for both integer and string types,
we can support them into acpi_dev_hid_uid_match() helper as well.

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 57b8543c

drivers/acpi/utils.c

+0 −29
Original line number Diff line number Diff line
@@ -824,35 +824,6 @@ 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. 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

include/acpi/acpi_bus.h

+23 −1
Original line number Diff line number Diff line
@@ -764,9 +764,15 @@ 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);

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



static inline bool acpi_dev_hid_match(struct acpi_device *adev, const char *hid2)

{

	const char *hid1 = acpi_device_hid(adev);



	return hid1 && hid2 && !strcmp(hid1, hid2);

}



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

{

	const char *uid1 = acpi_device_uid(adev);
@@ -807,6 +813,22 @@ static inline bool acpi_int_uid_match(struct acpi_device *adev, u64 uid2) 
		 /* Treat as an integer otherwise */			\

		 default: acpi_int_uid_match)(adev, uid2)



/**

 * 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 0 or 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 0 or NULL, %false otherwise.

 */

#define acpi_dev_hid_uid_match(adev, hid2, uid2)			\

	(acpi_dev_hid_match(adev, hid2) &&				\

		(!(uid2) || acpi_dev_uid_match(adev, uid2)))



void acpi_dev_clear_dependencies(struct acpi_device *supplier);

bool acpi_dev_ready_for_enumeration(const struct acpi_device *device);

struct acpi_device *acpi_dev_get_next_consumer_dev(struct acpi_device *supplier,

include/linux/acpi.h

+1 −6
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ const char *acpi_get_subsystem_id(acpi_handle handle); 


/* Get rid of the -Wunused-variable for adev */

#define acpi_dev_uid_match(adev, uid2)			(adev && false)

#define acpi_dev_hid_uid_match(adev, hid2, uid2)	(adev && false)



#include <acpi/acpi_numa.h>
@@ -775,12 +776,6 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) 


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 int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer)

{

	return -ENODEV;