diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 14:45:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 14:45:51 +0200 |
| commit | 6e287ace225948565fdcbe3c5cc75d3843af79d0 (patch) | |
| tree | c8da80c9a0686704f6abacaf5677087bff5e8370 /p25.patch | |
| parent | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (diff) | |
| download | patches-6e287ace225948565fdcbe3c5cc75d3843af79d0.tar.gz | |
cleaned up the bus_type.dev_attrs patch series
Diffstat (limited to 'p25.patch')
| -rw-r--r-- | p25.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/p25.patch b/p25.patch deleted file mode 100644 index a255f6fb519605..00000000000000 --- a/p25.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- - drivers/sh/superhyway/superhyway-sysfs.c | 29 +++++++++++++++++++---------- - drivers/sh/superhyway/superhyway.c | 2 +- - include/linux/superhyway.h | 2 +- - 3 files changed, 21 insertions(+), 12 deletions(-) - ---- a/drivers/sh/superhyway/superhyway-sysfs.c -+++ b/drivers/sh/superhyway/superhyway-sysfs.c -@@ -19,7 +19,8 @@ static ssize_t name##_show(struct device - { \ - struct superhyway_device *s = to_superhyway_device(dev); \ - return sprintf(buf, fmt, s->field); \ --} -+} \ -+static DEVICE_ATTR_RO(name); - - /* VCR flags */ - superhyway_ro_attr(perr_flags, "0x%02x\n", vcr.perr_flags); -@@ -32,14 +33,22 @@ superhyway_ro_attr(top_mb, "0x%02x\n", v - /* Misc */ - superhyway_ro_attr(resource, "0x%08lx\n", resource[0].start); - --struct device_attribute superhyway_dev_attrs[] = { -- __ATTR_RO(perr_flags), -- __ATTR_RO(merr_flags), -- __ATTR_RO(mod_vers), -- __ATTR_RO(mod_id), -- __ATTR_RO(bot_mb), -- __ATTR_RO(top_mb), -- __ATTR_RO(resource), -- __ATTR_NULL, -+static struct attribute *superhyway_dev_attrs[] = { -+ &dev_attr_perr_flags.attr, -+ &dev_attr_merr_flags.attr, -+ &dev_attr_mod_vers.attr, -+ &dev_attr_mod_id.attr, -+ &dev_attr_bot_mb.attr, -+ &dev_attr_top_mb.attr, -+ &dev_attr_resource.attr, -+ NULL, - }; - -+static const struct attribute_group superhyway_dev_group = { -+ .attrs = superhyway_dev_attrs, -+}; -+ -+const struct attribute_group *superhyway_dev_groups[] = { -+ &superhyway_dev_group, -+ NULL, -+}; ---- a/drivers/sh/superhyway/superhyway.c -+++ b/drivers/sh/superhyway/superhyway.c -@@ -209,7 +209,7 @@ struct bus_type superhyway_bus_type = { - .name = "superhyway", - .match = superhyway_bus_match, - #ifdef CONFIG_SYSFS -- .dev_attrs = superhyway_dev_attrs, -+ .dev_groups = superhyway_dev_groups, - #endif - .probe = superhyway_device_probe, - .remove = superhyway_device_remove, ---- a/include/linux/superhyway.h -+++ b/include/linux/superhyway.h -@@ -101,7 +101,7 @@ int superhyway_add_device(unsigned long - int superhyway_add_devices(struct superhyway_bus *bus, struct superhyway_device **devices, int nr_devices); - - /* drivers/sh/superhyway/superhyway-sysfs.c */ --extern struct device_attribute superhyway_dev_attrs[]; -+extern const struct attribute_group *superhyway_dev_groups[]; - - #endif /* __LINUX_SUPERHYWAY_H */ - |