git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
drivers
/
macintosh
/
macio_sysfs.c
diff --git
a/drivers/macintosh/macio_sysfs.c
b/drivers/macintosh/macio_sysfs.c
index
112e5ef
..
6999ce5
100644
(file)
--- a/
drivers/macintosh/macio_sysfs.c
+++ b/
drivers/macintosh/macio_sysfs.c
@@
-9,7
+9,7
@@
field##_show (struct device *dev, struct device_attribute *attr, \
char *buf) \
{ \
struct macio_dev *mdev = to_macio_device (dev); \
char *buf) \
{ \
struct macio_dev *mdev = to_macio_device (dev); \
- return sprintf (buf, format_string, mdev->ofdev.
node->field);
\
+ return sprintf (buf, format_string, mdev->ofdev.
dev.of_node->field);
\
}
static ssize_t
}
static ssize_t
@@
-21,7
+21,7
@@
compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
int length = 0;
of = &to_macio_device (dev)->ofdev;
int length = 0;
of = &to_macio_device (dev)->ofdev;
- compat = of_get_property(of->node, "compatible", &cplen);
+ compat = of_get_property(of->
dev.of_
node, "compatible", &cplen);
if (!compat) {
*buf = '\0';
return 0;
if (!compat) {
*buf = '\0';
return 0;
@@
-44,7
+44,7
@@
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
struct of_device *ofdev = to_of_device(dev);
int len;
struct of_device *ofdev = to_of_device(dev);
int len;
- len = of_device_get_modalias(ofdev, buf, PAGE_SIZE);
+ len = of_device_get_modalias(ofdev, buf, PAGE_SIZE
- 2
);
buf[len] = '\n';
buf[len+1] = 0;
buf[len] = '\n';
buf[len+1] = 0;
@@
-52,6
+52,15
@@
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
return len+1;
}
return len+1;
}
+static ssize_t devspec_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct of_device *ofdev;
+
+ ofdev = to_of_device(dev);
+ return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
+}
+
macio_config_of_attr (name, "%s\n");
macio_config_of_attr (type, "%s\n");
macio_config_of_attr (name, "%s\n");
macio_config_of_attr (type, "%s\n");
@@
-60,5
+69,6
@@
struct device_attribute macio_dev_attrs[] = {
__ATTR_RO(type),
__ATTR_RO(compatible),
__ATTR_RO(modalias),
__ATTR_RO(type),
__ATTR_RO(compatible),
__ATTR_RO(modalias),
+ __ATTR_RO(devspec),
__ATTR_NULL
};
__ATTR_NULL
};