diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-16 01:57:45 (GMT) |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 13:22:28 (GMT) |
commit | 09e67ca2c523544e6b38aa570a5f62a0cf20b87b (patch) | |
tree | 134d2ba98b567586dd34ffa7d7f8cfd8fe0de149 /drivers | |
parent | 7bc228b1ef71f395aeb89bdf81bf95556b08b374 (diff) | |
download | linux-09e67ca2c523544e6b38aa570a5f62a0cf20b87b.tar.xz |
[POWERPC] Move of_device_get_modalias to drivers/of
Commit 140b932f8cb6cced10b96860651a198b1b89cbb9 ("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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/of/device.c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/drivers/of/device.c b/drivers/of/device.c index 8fbfeee..8a1d93a 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -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; +} |