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

Commit 67dcc26d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

device property: Constify device_get_match_data() 



Constify device_get_match_data() as OF and ACPI variants return
constant value.

Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
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 29d5325a

drivers/acpi/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ const struct acpi_device_id *acpi_match_device(const struct acpi_device_id *ids, 
}

EXPORT_SYMBOL_GPL(acpi_match_device);



void *acpi_device_get_match_data(const struct device *dev)

const void *acpi_device_get_match_data(const struct device *dev)

{

	const struct acpi_device_id *match;
@@ -838,7 +838,7 @@ void *acpi_device_get_match_data(const struct device *dev) 
	if (!match)

		return NULL;



	return (void *)match->driver_data;

	return (const void *)match->driver_data;

}

EXPORT_SYMBOL_GPL(acpi_device_get_match_data);

drivers/acpi/property.c

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

}



static void *

static const void *

acpi_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,

				  const struct device *dev)

{

drivers/base/property.c

+2 −3
Original line number Diff line number Diff line
@@ -1410,9 +1410,8 @@ int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, 
}

EXPORT_SYMBOL(fwnode_graph_parse_endpoint);



void *device_get_match_data(struct device *dev)

const void *device_get_match_data(struct device *dev)

{

	return fwnode_call_ptr_op(dev_fwnode(dev), device_get_match_data,

				  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

+2 −2
Original line number Diff line number Diff line
@@ -977,11 +977,11 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, 
	return 0;

}



static void *

static const void *

of_fwnode_device_get_match_data(const struct fwnode_handle *fwnode,

				const struct device *dev)

{

	return (void *)of_device_get_match_data(dev);

	return of_device_get_match_data(dev);

}



const struct fwnode_operations of_fwnode_ops = {

include/linux/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -587,7 +587,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_device_get_match_data(const struct device *dev);

const void *acpi_device_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 *);
@@ -766,7 +766,7 @@ static inline const struct acpi_device_id *acpi_match_device( 
	return NULL;

}



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

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

{

	return NULL;

}