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

Commit 09e67ca2 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Move of_device_get_modalias to drivers/of 



Commit 140b932f ("Create modalias file
in sysfs for of_platform bus") needs this to avoid breaking the sparc
builds.

Just move the code and add whitespace around some binary operators.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7bc228b1

arch/powerpc/kernel/of_device.c

+0 −48
Original line number Diff line number Diff line
@@ -89,54 +89,6 @@ struct of_device *of_device_alloc(struct device_node *np, 
}

EXPORT_SYMBOL(of_device_alloc);



ssize_t of_device_get_modalias(struct of_device *ofdev,

				char *str, ssize_t len)

{

	const char *compat;

	int cplen, i;

	ssize_t tsize, csize, repend;



	/* Name & Type */

	csize = snprintf(str, len, "of:N%sT%s",

				ofdev->node->name, ofdev->node->type);



	/* Get compatible property if any */

	compat = of_get_property(ofdev->node, "compatible", &cplen);

	if (!compat)

		return csize;



	/* Find true end (we tolerate multiple \0 at the end */

	for (i=(cplen-1); i>=0 && !compat[i]; i--)

		cplen--;

	if (!cplen)

		return csize;

	cplen++;



	/* Check space (need cplen+1 chars including final \0) */

	tsize = csize + cplen;

	repend = tsize;



	if (csize>=len)		/* @ the limit, all is already filled */

		return tsize;



	if (tsize>=len) {		/* limit compat list */

		cplen = len-csize-1;

		repend = len;

	}



	/* Copy and do char replacement */

	memcpy(&str[csize+1], compat, cplen);

	for (i=csize; i<repend; i++) {

		char c = str[i];

		if (c=='\0')

			str[i] = 'C';

		else if (c==' ')

			str[i] = '_';

	}



	return tsize;

}



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

{

	struct of_device *ofdev;

drivers/of/device.c

+48 −0
Original line number Diff line number Diff line
@@ -104,3 +104,51 @@ void of_device_unregister(struct of_device *ofdev) 
	device_unregister(&ofdev->dev);

}

EXPORT_SYMBOL(of_device_unregister);



ssize_t of_device_get_modalias(struct of_device *ofdev,

				char *str, ssize_t len)

{

	const char *compat;

	int cplen, i;

	ssize_t tsize, csize, repend;



	/* Name & Type */

	csize = snprintf(str, len, "of:N%sT%s",

				ofdev->node->name, ofdev->node->type);



	/* Get compatible property if any */

	compat = of_get_property(ofdev->node, "compatible", &cplen);

	if (!compat)

		return csize;



	/* Find true end (we tolerate multiple \0 at the end */

	for (i = (cplen - 1); i >= 0 && !compat[i]; i--)

		cplen--;

	if (!cplen)

		return csize;

	cplen++;



	/* Check space (need cplen+1 chars including final \0) */

	tsize = csize + cplen;

	repend = tsize;



	if (csize >= len)		/* @ the limit, all is already filled */

		return tsize;



	if (tsize >= len) {		/* limit compat list */

		cplen = len - csize - 1;

		repend = len;

	}



	/* Copy and do char replacement */

	memcpy(&str[csize + 1], compat, cplen);

	for (i = csize; i < repend; i++) {

		char c = str[i];

		if (c == '\0')

			str[i] = 'C';

		else if (c == ' ')

			str[i] = '_';

	}



	return tsize;

}

include/asm-powerpc/of_device.h

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ extern struct of_device *of_device_alloc(struct device_node *np, 
					 const char *bus_id,

					 struct device *parent);



extern ssize_t of_device_get_modalias(struct of_device *ofdev,

					char *str, ssize_t len);

extern int of_device_uevent(struct device *dev,

			    struct kobj_uevent_env *env);

include/linux/of_device.h

+3 −0
Original line number Diff line number Diff line
@@ -24,4 +24,7 @@ static inline void of_device_free(struct of_device *dev) 
	of_release_dev(&dev->dev);

}



extern ssize_t of_device_get_modalias(struct of_device *ofdev,

					char *str, ssize_t len);



#endif /* _LINUX_OF_DEVICE_H */