Commit 5c3d15e1 authored by Miquel Raynal's avatar Miquel Raynal Committed by Greg Kroah-Hartman
Browse files

of: Update of_device_get_modalias() 



This function only needs a "struct device_node" to work, but for
convenience the author (and only user) of this helper did use a "struct
device" and put it in device.c.

Let's convert this helper to take a "struct device node" instead. This
change asks for two additional changes: renaming it "of_modalias()"
to fit the current naming, and moving it outside of device.c which will
be done in a follow-up commit.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230404172148.82422-8-srinivas.kandagatla@linaro.org


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

drivers/of/device.c

+17 −12
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ const void *of_device_get_match_data(const struct device *dev) 
}

EXPORT_SYMBOL(of_device_get_match_data);



static ssize_t of_device_get_modalias(const struct device *dev, char *str, ssize_t len)

static ssize_t of_modalias(const struct device_node *np, char *str, ssize_t len)

{

	const char *compat;

	char *c;
@@ -256,19 +256,16 @@ static ssize_t of_device_get_modalias(const struct device *dev, char *str, ssize 
	ssize_t csize;

	ssize_t tsize;



	if ((!dev) || (!dev->of_node) || dev->of_node_reused)

		return -ENODEV;



	/* Name & Type */

	/* %p eats all alphanum characters, so %c must be used here */

	csize = snprintf(str, len, "of:N%pOFn%c%s", dev->of_node, 'T',

			 of_node_get_device_type(dev->of_node));

	csize = snprintf(str, len, "of:N%pOFn%c%s", np, 'T',

			 of_node_get_device_type(np));

	tsize = csize;

	len -= csize;

	if (str)

		str += csize;



	of_property_for_each_string(dev->of_node, "compatible", p, compat) {

	of_property_for_each_string(np, "compatible", p, compat) {

		csize = strlen(compat) + 1;

		tsize += csize;

		if (csize > len)
@@ -293,7 +290,10 @@ int of_device_request_module(struct device *dev) 
	ssize_t size;

	int ret;



	size = of_device_get_modalias(dev, NULL, 0);

	if (!dev || !dev->of_node)

		return -ENODEV;



	size = of_modalias(dev->of_node, NULL, 0);

	if (size < 0)

		return size;
@@ -304,7 +304,7 @@ int of_device_request_module(struct device *dev) 
	if (!str)

		return -ENOMEM;



	of_device_get_modalias(dev, str, size);

	of_modalias(dev->of_node, str, size);

	str[size - 1] = '\0';

	ret = request_module(str);

	kfree(str);
@@ -321,7 +321,12 @@ EXPORT_SYMBOL_GPL(of_device_request_module); 
 */

ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len)

{

	ssize_t sl = of_device_get_modalias(dev, str, len - 2);

	ssize_t sl;



	if (!dev || !dev->of_node || dev->of_node_reused)

		return -ENODEV;



	sl = of_modalias(dev->of_node, str, len - 2);

	if (sl < 0)

		return sl;

	if (sl > len - 2)
@@ -386,7 +391,7 @@ int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env * 
	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;



	sl = of_device_get_modalias(dev, &env->buf[env->buflen-1],

	sl = of_modalias(dev->of_node, &env->buf[env->buflen-1],

			 sizeof(env->buf) - env->buflen);

	if (sl < 0)

		return sl;