aboutsummaryrefslogtreecommitdiffstats
path: root/c05.patch
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-22 17:08:18 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-22 17:08:18 +0100
commite7d7dc0e0e7ab68f1845e11b7574d83ac8015e0e (patch)
tree72d317ef93f50aa80af2f67c9d109e7ff59413ff /c05.patch
parent08ba5e5e533732546b64764231406dd6151342c1 (diff)
downloadpatches-e7d7dc0e0e7ab68f1845e11b7574d83ac8015e0e.tar.gz
lots of patches and fixes added and made
Diffstat (limited to 'c05.patch')
-rw-r--r--c05.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/c05.patch b/c05.patch
new file mode 100644
index 00000000000000..38c518fbc94159
--- /dev/null
+++ b/c05.patch
@@ -0,0 +1,39 @@
+---
+ 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,