Skip to content

Commit

Permalink
[POWERPC] macintosh: Use common modalias generation for macio_sysfs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
smunaut authored and paulusmack committed May 7, 2007
1 parent de41189 commit 29aa028
Showing 1 changed file with 7 additions and 20 deletions.
27 changes: 7 additions & 20 deletions drivers/macintosh/macio_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 29aa028

Please sign in to comment.