device property: Constify device_get_match_data()
Subsystems (5)
Andy Shevchenko
reviewerPATCH 4/4 device property: Constify device_get_match_data()
Constify device_get_match_data() as OF and ACPI variants return constant value.
Fixes 80212a162329 ("ACPI / bus: Introduce acpi_get_match_data() function")
Fixes b283f157611f ("device property: Introduce a common API to fetch device match data")
Fixes 146b4dbb0eef ("ACPI: properties: Implement get_match_data() callback")
Cc Sinan Kaya <[email protected]>
Cc Sakari Ailus <[email protected]>
Cc Vinod Koul <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/acpi/bus.c | 4 ++-- drivers/acpi/property.c | 2 +- drivers/base/property.c | 5 ++--- drivers/of/property.c | 4 ++-- include/linux/acpi.h | 4 ++-- include/linux/fwnode.h | 4 ++-- include/linux/property.h | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-)
drivers/acpi/bus.c +2 -2
@@ -785,7 +785,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;
@@ -793,7 +793,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
@@ -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
@@ -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
@@ -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
@@ -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 ; }
include/linux/fwnode.h +2 -2
@@ -73,8 +73,8 @@ struct fwnode_operations {struct fwnode_handle *(*get)(struct fwnode_handle *fwnode);void (*put)(struct fwnode_handle *fwnode);bool (*device_is_available)(const struct fwnode_handle *fwnode); -void *(*device_get_match_data)(const struct fwnode_handle *fwnode, -const struct device *dev); +const void *(*device_get_match_data)(const struct fwnode_handle *fwnode, +const struct device *dev);bool (*property_present)(const struct fwnode_handle *fwnode,const char *propname); int (*property_read_int_array)(const struct fwnode_handle *fwnode,
include/linux/property.h +1 -1
@@ -283,7 +283,7 @@ bool device_dma_supported(struct device *dev);enum dev_dma_attr device_get_dma_attr (struct device *dev); -void *device_get_match_data (struct device *dev); +const void *device_get_match_data (struct device *dev);int device_get_phy_mode (struct device *dev);