| --- |
| drivers/mtd/ubi/build.c | 16 +++++++++------- |
| 1 file changed, 9 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/mtd/ubi/build.c |
| +++ b/drivers/mtd/ubi/build.c |
| @@ -104,23 +104,25 @@ DEFINE_MUTEX(ubi_devices_mutex); |
| static DEFINE_SPINLOCK(ubi_devices_lock); |
| |
| /* "Show" method for files in '/<sysfs>/class/ubi/' */ |
| -static ssize_t ubi_version_show(struct class *class, |
| - struct class_attribute *attr, char *buf) |
| +/* UBI version attribute ('/<sysfs>/class/ubi/version') */ |
| +static ssize_t version_show(struct class *class, struct class_attribute *attr, |
| + char *buf) |
| { |
| return sprintf(buf, "%d\n", UBI_VERSION); |
| } |
| +static CLASS_ATTR_RO(version); |
| |
| -/* UBI version attribute ('/<sysfs>/class/ubi/version') */ |
| -static struct class_attribute ubi_class_attrs[] = { |
| - __ATTR(version, S_IRUGO, ubi_version_show, NULL), |
| - __ATTR_NULL |
| +static struct attributes *ubi_class_attrs[] = { |
| + &class_attr_version.attr, |
| + NULL, |
| }; |
| +ATTRIBUTE_GROUPS(ubi_class); |
| |
| /* Root UBI "class" object (corresponds to '/<sysfs>/class/ubi/') */ |
| struct class ubi_class = { |
| .name = UBI_NAME_STR, |
| .owner = THIS_MODULE, |
| - .class_attrs = ubi_class_attrs, |
| + .class_groups = ubi_class_groups, |
| }; |
| |
| static ssize_t dev_attribute_show(struct device *dev, |
