Commit 2b5ae960 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI: bus: Introduce acpi_match_acpi_device() helper 



Match the ACPI device against a given list of ACPI IDs.

Subsequent changes will make use of this.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[ rjw: Changelog edit ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 90f6af81

drivers/acpi/bus.c

+21 −4
Original line number Diff line number Diff line
@@ -850,6 +850,26 @@ static bool __acpi_match_device(struct acpi_device *device, 
	return true;

}



/**

 * acpi_match_acpi_device - Match an ACPI device against a given list of ACPI IDs

 * @ids: Array of struct acpi_device_id objects to match against.

 * @adev: The ACPI device pointer to match.

 *

 * Match the ACPI device @adev against a given list of ACPI IDs @ids.

 *

 * Return:

 * a pointer to the first matching ACPI ID on success or %NULL on failure.

 */

const struct acpi_device_id *acpi_match_acpi_device(const struct acpi_device_id *ids,

						    const struct acpi_device *adev)

{

	const struct acpi_device_id *id = NULL;



	__acpi_match_device(adev, ids, NULL, &id, NULL);

	return id;

}

EXPORT_SYMBOL_GPL(acpi_match_acpi_device);



/**

 * acpi_match_device - Match a struct device against a given list of ACPI IDs

 * @ids: Array of struct acpi_device_id object to match against.
@@ -864,10 +884,7 @@ static bool __acpi_match_device(struct acpi_device *device, 
const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,

					       const struct device *dev)

{

	const struct acpi_device_id *id = NULL;



	__acpi_match_device(acpi_companion_match(dev), ids, NULL, &id, NULL);

	return id;

	return acpi_match_acpi_device(ids, acpi_companion_match(dev));

}

EXPORT_SYMBOL_GPL(acpi_match_device);

include/linux/acpi.h

+9 −0
Original line number Diff line number Diff line
@@ -719,6 +719,9 @@ extern int acpi_nvs_register(__u64 start, __u64 size); 
extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),

				    void *data);



const struct acpi_device_id *acpi_match_acpi_device(const struct acpi_device_id *ids,

						    const struct acpi_device *adev);



const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,

					       const struct device *dev);
@@ -935,6 +938,12 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), 


struct acpi_device_id;



static inline const struct acpi_device_id *acpi_match_acpi_device(

	const struct acpi_device_id *ids, const struct acpi_device *adev)

{

	return NULL;

}



static inline const struct acpi_device_id *acpi_match_device(

	const struct acpi_device_id *ids, const struct device *dev)

{