Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf761af9 authored by Mika Westerberg's avatar Mika Westerberg Committed by Rafael J. Wysocki
Browse files

ACPI: Provide generic functions for matching ACPI device nodes 



Introduce function acpi_match_device() allowing callers to match
struct device objects with populated acpi_handle fields against
arrays of ACPI device IDs.  Also introduce function
acpi_driver_match_device() using acpi_match_device() internally and
allowing callers to match a struct device object against an array of
ACPI device IDs provided by a device driver.

Additionally, introduce macro ACPI_PTR() that may be used by device
drivers to escape pointers to data structures whose definitions
depend on CONFIG_ACPI.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 06f64c8f

drivers/acpi/scan.c

+35 −5
Original line number Original line Diff line number Diff line
@@ -340,8 +340,8 @@ static void acpi_device_remove_files(struct acpi_device *dev) 
			ACPI Bus operations

			ACPI Bus operations

   -------------------------------------------------------------------------- */

   -------------------------------------------------------------------------- */





int acpi_match_device_ids(struct acpi_device *device,

static const struct acpi_device_id *__acpi_match_device(

			  const struct acpi_device_id *ids)

	struct acpi_device *device, const struct acpi_device_id *ids)

{

{

	const struct acpi_device_id *id;

	const struct acpi_device_id *id;

	struct acpi_hardware_id *hwid;

	struct acpi_hardware_id *hwid;
@@ -351,14 +351,44 @@ int acpi_match_device_ids(struct acpi_device *device, 
	 * driver for it.

	 * driver for it.

	 */

	 */

	if (!device->status.present)

	if (!device->status.present)

		return -ENODEV;

		return NULL;





	for (id = ids; id->id[0]; id++)

	for (id = ids; id->id[0]; id++)

		list_for_each_entry(hwid, &device->pnp.ids, list)

		list_for_each_entry(hwid, &device->pnp.ids, list)

			if (!strcmp((char *) id->id, hwid->id))

			if (!strcmp((char *) id->id, hwid->id))

				return 0;

				return id;





	return -ENOENT;

	return NULL;

}



/**

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

 * @dev: The device structure to match.

 *

 * Check if @dev has a valid ACPI handle and if there is a struct acpi_device

 * object for that handle and use that object to match against a given list of

 * device IDs.

 *

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

 */

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

					       const struct device *dev)

{

	struct acpi_device *adev;



	if (!ids || !dev->acpi_handle

	    || ACPI_FAILURE(acpi_bus_get_device(dev->acpi_handle, &adev)))

		return NULL;



	return __acpi_match_device(adev, ids);

}

EXPORT_SYMBOL_GPL(acpi_match_device);



int acpi_match_device_ids(struct acpi_device *device,

			  const struct acpi_device_id *ids)

{

	return __acpi_match_device(device, ids) ? 0 : -ENOENT;

}

}

EXPORT_SYMBOL(acpi_match_device_ids);

EXPORT_SYMBOL(acpi_match_device_ids);

include/linux/acpi.h

+28 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define _LINUX_ACPI_H

#define _LINUX_ACPI_H





#include <linux/ioport.h>	/* for struct resource */

#include <linux/ioport.h>	/* for struct resource */

#include <linux/device.h>





#ifdef	CONFIG_ACPI

#ifdef	CONFIG_ACPI
@@ -364,6 +365,17 @@ extern int acpi_nvs_register(__u64 start, __u64 size); 
extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),

extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *),

				    void *data);

				    void *data);





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

					       const struct device *dev);



static inline bool acpi_driver_match_device(struct device *dev,

					    const struct device_driver *drv)

{

	return !!acpi_match_device(drv->acpi_match_table, dev);

}



#define ACPI_PTR(_ptr)	(_ptr)



#else	/* !CONFIG_ACPI */

#else	/* !CONFIG_ACPI */





#define acpi_disabled 1

#define acpi_disabled 1
@@ -418,6 +430,22 @@ static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), 
	return 0;

	return 0;

}

}





struct acpi_device_id;



static inline const struct acpi_device_id *acpi_match_device(

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

{

	return NULL;

}



static inline bool acpi_driver_match_device(struct device *dev,

					    const struct device_driver *drv)

{

	return false;

}



#define ACPI_PTR(_ptr)	(NULL)



#endif	/* !CONFIG_ACPI */

#endif	/* !CONFIG_ACPI */





#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI