Commit 23ead33b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

device property: Constify fwnode connection match APIs 



The fwnode and device parameters are not altered in the fwnode
connection match APIs, constify them.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Link: https://lore.kernel.org/r/20221004092129.19412-3-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b295d484

drivers/base/property.c

+4 −4
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ const void *device_get_match_data(const struct device *dev) 
}

EXPORT_SYMBOL_GPL(device_get_match_data);



static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode,

static unsigned int fwnode_graph_devcon_matches(const struct fwnode_handle *fwnode,

						const char *con_id, void *data,

						devcon_match_fn_t match,

						void **matches,
@@ -1247,7 +1247,7 @@ static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode, 
	return count;

}



static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode,

static unsigned int fwnode_devcon_matches(const struct fwnode_handle *fwnode,

					  const char *con_id, void *data,

					  devcon_match_fn_t match,

					  void **matches,
@@ -1289,7 +1289,7 @@ static unsigned int fwnode_devcon_matches(struct fwnode_handle *fwnode, 
 * device node. @match will be used to convert the connection description to

 * data the caller is expecting to be returned.

 */

void *fwnode_connection_find_match(struct fwnode_handle *fwnode,

void *fwnode_connection_find_match(const struct fwnode_handle *fwnode,

				   const char *con_id, void *data,

				   devcon_match_fn_t match)

{
@@ -1326,7 +1326,7 @@ EXPORT_SYMBOL_GPL(fwnode_connection_find_match); 
 *

 * Return: Number of matches resolved, or negative errno.

 */

int fwnode_connection_find_matches(struct fwnode_handle *fwnode,

int fwnode_connection_find_matches(const struct fwnode_handle *fwnode,

				   const char *con_id, void *data,

				   devcon_match_fn_t match,

				   void **matches, unsigned int matches_len)

drivers/usb/roles/class.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ enum usb_role usb_role_switch_get_role(struct usb_role_switch *sw) 
}

EXPORT_SYMBOL_GPL(usb_role_switch_get_role);



static void *usb_role_switch_match(struct fwnode_handle *fwnode, const char *id,

static void *usb_role_switch_match(const struct fwnode_handle *fwnode, const char *id,

				   void *data)

{

	struct device *dev;

drivers/usb/typec/mux.c

+4 −4
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ static int switch_fwnode_match(struct device *dev, const void *fwnode) 
	return device_match_fwnode(dev, fwnode);

}



static void *typec_switch_match(struct fwnode_handle *fwnode, const char *id,

				void *data)

static void *typec_switch_match(const struct fwnode_handle *fwnode,

				const char *id, void *data)

{

	struct device *dev;
@@ -262,8 +262,8 @@ static int mux_fwnode_match(struct device *dev, const void *fwnode) 
	return device_match_fwnode(dev, fwnode);

}



static void *typec_mux_match(struct fwnode_handle *fwnode, const char *id,

			     void *data)

static void *typec_mux_match(const struct fwnode_handle *fwnode,

			     const char *id, void *data)

{

	const struct typec_altmode_desc *desc = data;

	struct device *dev;

drivers/usb/typec/retimer.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int retimer_fwnode_match(struct device *dev, const void *fwnode) 
	return device_match_fwnode(dev, fwnode) && dev_name_ends_with(dev, "-retimer");

}



static void *typec_retimer_match(struct fwnode_handle *fwnode, const char *id, void *data)

static void *typec_retimer_match(const struct fwnode_handle *fwnode, const char *id, void *data)

{

	struct device *dev;

include/linux/property.h

+4 −4
Original line number Diff line number Diff line
@@ -442,21 +442,21 @@ unsigned int fwnode_graph_get_endpoint_count(struct fwnode_handle *fwnode, 
int fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode,

				struct fwnode_endpoint *endpoint);



typedef void *(*devcon_match_fn_t)(struct fwnode_handle *fwnode, const char *id,

typedef void *(*devcon_match_fn_t)(const struct fwnode_handle *fwnode, const char *id,

				   void *data);



void *fwnode_connection_find_match(struct fwnode_handle *fwnode,

void *fwnode_connection_find_match(const struct fwnode_handle *fwnode,

				   const char *con_id, void *data,

				   devcon_match_fn_t match);



static inline void *device_connection_find_match(struct device *dev,

static inline void *device_connection_find_match(const struct device *dev,

						 const char *con_id, void *data,

						 devcon_match_fn_t match)

{

	return fwnode_connection_find_match(dev_fwnode(dev), con_id, data, match);

}



int fwnode_connection_find_matches(struct fwnode_handle *fwnode,

int fwnode_connection_find_matches(const struct fwnode_handle *fwnode,

				   const char *con_id, void *data,

				   devcon_match_fn_t match,

				   void **matches, unsigned int matches_len);