diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 23:10:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 23:10:14 -0700 |
| commit | 9e06a307a040bb17573afb2f48b6a7d26920394f (patch) | |
| tree | 222b8cbd15a432f906f01dcd21de484984a01bc4 /p25.patch | |
| parent | 439aaed86577bc756086c2193f8fa23ae48d6722 (diff) | |
| download | patches-9e06a307a040bb17573afb2f48b6a7d26920394f.tar.gz | |
new dev_attr bus removal patches added
Diffstat (limited to 'p25.patch')
| -rw-r--r-- | p25.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/p25.patch b/p25.patch new file mode 100644 index 00000000000000..a255f6fb519605 --- /dev/null +++ b/p25.patch @@ -0,0 +1,72 @@ +--- + 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 */ + |