[POWERPC] Move of_device_get_modalias to drivers/of
Commit 140b932f8c
("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: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:

committed by
Paul Mackerras

parent
7bc228b1ef
commit
09e67ca2c5
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user