diff options
author | Sylvain Munaut <tnt@246tNt.com> | 2007-05-07 01:38:47 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 20:31:15 +1000 |
commit | 29aa0289b895a0ad1641a90f94638c277f9cf8ec (patch) | |
tree | aa5ed3d8f6c34c62514f2c13748c6b0b2efde5b0 | |
parent | de41189bf6838c1c885d360e5cdf7ec6b4d336d6 (diff) | |
download | blackbird-op-linux-29aa0289b895a0ad1641a90f94638c277f9cf8ec.tar.gz blackbird-op-linux-29aa0289b895a0ad1641a90f94638c277f9cf8ec.zip |
[POWERPC] macintosh: Use common modalias generation for macio_sysfs
There is now a common function to generate the modalias string,
so use it. We just need to add the \n at the end.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | drivers/macintosh/macio_sysfs.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c index cc8267912656..112e5ef728f1 100644 --- a/drivers/macintosh/macio_sysfs.c +++ b/drivers/macintosh/macio_sysfs.c @@ -41,28 +41,15 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf) static ssize_t modalias_show (struct device *dev, struct device_attribute *attr, char *buf) { - struct of_device *of; - const char *compat; - int cplen; - int length; + struct of_device *ofdev = to_of_device(dev); + int len; - of = &to_macio_device (dev)->ofdev; - compat = of_get_property(of->node, "compatible", &cplen); - if (!compat) compat = "", cplen = 1; - length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type); - buf += length; - while (cplen > 0) { - int l; - l = sprintf (buf, "C%s", compat); - length += l; - buf += l; - l = strlen (compat) + 1; - compat += l; - cplen -= l; - } - length += sprintf(buf, "\n"); + len = of_device_get_modalias(ofdev, buf, PAGE_SIZE); - return length; + buf[len] = '\n'; + buf[len+1] = 0; + + return len+1; } macio_config_of_attr (name, "%s\n"); |