diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-23 11:19:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-23 11:19:41 +0100 |
| commit | 8fb5fa5c9e538e3a5a08a1479c7c59d0e5d63d7a (patch) | |
| tree | e398a61e97ba25d1c30575382a4f701e56d3605e /c10.patch | |
| parent | e7d7dc0e0e7ab68f1845e11b7574d83ac8015e0e (diff) | |
| download | patches-8fb5fa5c9e538e3a5a08a1479c7c59d0e5d63d7a.tar.gz | |
more patches
Diffstat (limited to 'c10.patch')
| -rw-r--r-- | c10.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/c10.patch b/c10.patch new file mode 100644 index 00000000000000..422409d813db94 --- /dev/null +++ b/c10.patch @@ -0,0 +1,51 @@ +--- + arch/avr32/boards/merisc/merisc_sysfs.c | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + +--- a/arch/avr32/boards/merisc/merisc_sysfs.c ++++ b/arch/avr32/boards/merisc/merisc_sysfs.c +@@ -18,7 +18,7 @@ + #include <linux/ctype.h> + #include "merisc.h" + +-static ssize_t merisc_model_show(struct class *class, char *buf) ++static ssize_t model_show(struct class *class, char *buf) + { + ssize_t ret = 0; + +@@ -27,8 +27,9 @@ static ssize_t merisc_model_show(struct + + return ret; + } ++static CLASS_ATTRIBUTE_RO(model); + +-static ssize_t merisc_revision_show(struct class *class, char *buf) ++static ssize_t revision_show(struct class *class, char *buf) + { + ssize_t ret = 0; + +@@ -37,17 +38,19 @@ static ssize_t merisc_revision_show(stru + + return ret; + } ++static CLASS_ATTRIBUTE_RO(revision); + +-static struct class_attribute merisc_class_attrs[] = { +- __ATTR(model, S_IRUGO, merisc_model_show, NULL), +- __ATTR(revision, S_IRUGO, merisc_revision_show, NULL), +- __ATTR_NULL, ++static struct attribute *merisc_class_attrs[] = { ++ &class_attr_model.attr, ++ &class_attr_revision.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(merisc_class); + + struct class merisc_class = { + .name = "merisc", + .owner = THIS_MODULE, +- .class_attrs = merisc_class_attrs, ++ .class_groups = merisc_class_groups, + }; + + static int __init merisc_sysfs_init(void) |