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

Commit 40303764 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/device_changes' into for-linus

parents 1eac3218 146b4dbb

drivers/acpi/bus.c

+18 −0
Original line number Diff line number Diff line
@@ -785,6 +785,24 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, 
}

EXPORT_SYMBOL_GPL(acpi_match_device);



void *acpi_get_match_data(const struct device *dev)

{

	const struct acpi_device_id *match;



	if (!dev->driver)

		return NULL;



	if (!dev->driver->acpi_match_table)

		return NULL;



	match = acpi_match_device(dev->driver->acpi_match_table, dev);

	if (!match)

		return NULL;



	return (void *)match->driver_data;

}

EXPORT_SYMBOL_GPL(acpi_get_match_data);



int acpi_match_device_ids(struct acpi_device *device,

			  const struct acpi_device_id *ids)

{

drivers/acpi/property.c

+8 −0
Original line number Diff line number Diff line
@@ -1271,9 +1271,17 @@ static int acpi_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, 
	return 0;

}



static void *

acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,

				  const struct device *dev)

{

	return acpi_get_match_data(dev);

}



#define DECLARE_ACPI_FWNODE_OPS(ops) \

	const struct fwnode_operations ops = {				\

		.device_is_available = acpi_fwnode_device_is_available, \

		.device_get_match_data = acpi_fwnode_device_get_match_data, \

		.property_present = acpi_fwnode_property_present,	\

		.property_read_int_array =				\

			acpi_fwnode_property_read_int_array,		\

drivers/base/property.c

+7 −0
Original line number Diff line number Diff line
@@ -1340,3 +1340,10 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, 
	return fwnode_call_int_op(fwnode, graph_parse_endpoint, endpoint);

}

EXPORT_SYMBOL(fwnode_graph_parse_endpoint);



void *device_get_match_data(struct device *dev)

{

	return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data,

				  dev);

}

EXPORT_SYMBOL_GPL(device_get_match_data);

drivers/of/property.c

+8 −0
Original line number Diff line number Diff line
@@ -981,10 +981,18 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, 
	return 0;

}



static void *

of_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,

				const struct device *dev)

{

	return (void *)of_device_get_match_data(dev);

}



const struct fwnode_operations of_fwnode_ops = {

	.get = of_fwnode_get,

	.put = of_fwnode_put,

	.device_is_available = of_fwnode_device_is_available,

	.device_get_match_data = of_fwnode_device_get_match_data,

	.property_present = of_fwnode_property_present,

	.property_read_int_array = of_fwnode_property_read_int_array,

	.property_read_string_array = of_fwnode_property_read_string_array,

include/linux/acpi.h

+6 −0
Original line number Diff line number Diff line
@@ -584,6 +584,7 @@ extern int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), 
const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids,

					       const struct device *dev);



void *acpi_get_match_data(const struct device *dev);

extern bool acpi_driver_match_device(struct device *dev,

				     const struct device_driver *drv);

int acpi_device_uevent_modalias(struct device *, struct kobj_uevent_env *);
@@ -755,6 +756,11 @@ static inline const struct acpi_device_id *acpi_match_device( 
	return NULL;

}



static inline void *acpi_get_match_data(const struct device *dev)

{

	return NULL;

}



static inline bool acpi_driver_match_device(struct device *dev,

					    const struct device_driver *drv)

{