mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
[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>
This commit is contained in:
parent
de41189bf6
commit
29aa0289b8
@ -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,
|
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
|
||||||
char *buf)
|
char *buf)
|
||||||
{
|
{
|
||||||
struct of_device *of;
|
struct of_device *ofdev = to_of_device(dev);
|
||||||
const char *compat;
|
int len;
|
||||||
int cplen;
|
|
||||||
int length;
|
|
||||||
|
|
||||||
of = &to_macio_device (dev)->ofdev;
|
len = of_device_get_modalias(ofdev, buf, PAGE_SIZE);
|
||||||
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");
|
|
||||||
|
|
||||||
return length;
|
buf[len] = '\n';
|
||||||
|
buf[len+1] = 0;
|
||||||
|
|
||||||
|
return len+1;
|
||||||
}
|
}
|
||||||
|
|
||||||
macio_config_of_attr (name, "%s\n");
|
macio_config_of_attr (name, "%s\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user