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

Commit dd27dcda authored by Grant Likely's avatar Grant Likely
Browse files

of/device: merge of_device_uevent 



Merge common code between powerpc and microblaze

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
CC: Michal Simek <monstr@monstr.eu>
CC: Wolfram Sang <w.sang@pengutronix.de>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: microblaze-uclinux@itee.uq.edu.au
CC: linuxppc-dev@ozlabs.org
parent d3571c3a

arch/microblaze/include/asm/of_device.h

+0 −3
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ extern struct of_device *of_device_alloc(struct device_node *np, 
					 const char *bus_id,

					 struct device *parent);



extern int of_device_uevent(struct device *dev,

			    struct kobj_uevent_env *env);



extern void of_device_make_bus_id(struct of_device *dev);



/* This is just here during the transition */

arch/microblaze/kernel/of_device.c

+0 −48
Original line number Diff line number Diff line
@@ -62,51 +62,3 @@ struct of_device *of_device_alloc(struct device_node *np, 
	return dev;

}

EXPORT_SYMBOL(of_device_alloc);
 


int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct of_device *ofdev;

	const char *compat;

	int seen = 0, cplen, sl;



	if (!dev)

		return -ENODEV;



	ofdev = to_of_device(dev);



	if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name))

		return -ENOMEM;



	if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type))

		return -ENOMEM;



	/* Since the compatible field can contain pretty much anything

	 * it's not really legal to split it out with commas. We split it

	 * up using a number of environment variables instead. */



	compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);

	while (compat && *compat && cplen > 0) {

		if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))

			return -ENOMEM;



		sl = strlen(compat) + 1;

		compat += sl;

		cplen -= sl;

		seen++;

	}



	if (add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen))

		return -ENOMEM;



	/* modalias is trickier, we add it in 2 steps */

	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;

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

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

	if (sl >= (sizeof(env->buf) - env->buflen))

		return -ENOMEM;

	env->buflen += sl;



	return 0;

}

EXPORT_SYMBOL(of_device_uevent);

arch/powerpc/include/asm/of_device.h

+0 −3
Original line number Diff line number Diff line
@@ -9,8 +9,5 @@ extern struct of_device *of_device_alloc(struct device_node *np, 
					 const char *bus_id,

					 struct device *parent);



extern int of_device_uevent(struct device *dev,

			    struct kobj_uevent_env *env);



#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_OF_DEVICE_H */

arch/powerpc/kernel/of_device.c

+0 −49
Original line number Diff line number Diff line
@@ -82,52 +82,3 @@ struct of_device *of_device_alloc(struct device_node *np, 
	return dev;

}

EXPORT_SYMBOL(of_device_alloc);
 


int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	struct of_device *ofdev;

	const char *compat;

	int seen = 0, cplen, sl;



	if (!dev)

		return -ENODEV;



	ofdev = to_of_device(dev);



	if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name))

		return -ENOMEM;



	if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type))

		return -ENOMEM;



        /* Since the compatible field can contain pretty much anything

         * it's not really legal to split it out with commas. We split it

         * up using a number of environment variables instead. */



	compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);

	while (compat && *compat && cplen > 0) {

		if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))

			return -ENOMEM;



		sl = strlen (compat) + 1;

		compat += sl;

		cplen -= sl;

		seen++;

	}



	if (add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen))

		return -ENOMEM;



	/* modalias is trickier, we add it in 2 steps */

	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;

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

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

	if (sl >= (sizeof(env->buf) - env->buflen))

		return -ENOMEM;

	env->buflen += sl;



	return 0;

}

EXPORT_SYMBOL(of_device_uevent);

EXPORT_SYMBOL(of_device_get_modalias);

drivers/of/device.c

+48 −0
Original line number Diff line number Diff line
@@ -170,3 +170,51 @@ ssize_t of_device_get_modalias(struct of_device *ofdev, 


	return tsize;

}



/**

 * of_device_uevent - Display OF related uevent information

 */

int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)

{

	const char *compat;

	int seen = 0, cplen, sl;



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

		return -ENODEV;



	if (add_uevent_var(env, "OF_NAME=%s", dev->of_node->name))

		return -ENOMEM;



	if (add_uevent_var(env, "OF_TYPE=%s", dev->of_node->type))

		return -ENOMEM;



	/* Since the compatible field can contain pretty much anything

	 * it's not really legal to split it out with commas. We split it

	 * up using a number of environment variables instead. */



	compat = of_get_property(dev->of_node, "compatible", &cplen);

	while (compat && *compat && cplen > 0) {

		if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))

			return -ENOMEM;



		sl = strlen(compat) + 1;

		compat += sl;

		cplen -= sl;

		seen++;

	}



	if (add_uevent_var(env, "OF_COMPATIBLE_N=%d", seen))

		return -ENOMEM;



	/* modalias is trickier, we add it in 2 steps */

	if (add_uevent_var(env, "MODALIAS="))

		return -ENOMEM;



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

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

	if (sl >= (sizeof(env->buf) - env->buflen))

		return -ENOMEM;

	env->buflen += sl;



	return 0;

}