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 /p23.patch | |
| parent | 439aaed86577bc756086c2193f8fa23ae48d6722 (diff) | |
| download | patches-9e06a307a040bb17573afb2f48b6a7d26920394f.tar.gz | |
new dev_attr bus removal patches added
Diffstat (limited to 'p23.patch')
| -rw-r--r-- | p23.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/p23.patch b/p23.patch new file mode 100644 index 00000000000000..6e09808cf5201d --- /dev/null +++ b/p23.patch @@ -0,0 +1,50 @@ +--- + drivers/rpmsg/virtio_rpmsg_bus.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +--- a/drivers/rpmsg/virtio_rpmsg_bus.c ++++ b/drivers/rpmsg/virtio_rpmsg_bus.c +@@ -125,7 +125,8 @@ field##_show(struct device *dev, \ + struct rpmsg_channel *rpdev = to_rpmsg_channel(dev); \ + \ + return sprintf(buf, format_string, rpdev->path); \ +-} ++} \ ++static DEVICE_ATTR_RO(field); + + /* for more info, see Documentation/ABI/testing/sysfs-bus-rpmsg */ + rpmsg_show_attr(name, id.name, "%s\n"); +@@ -148,15 +149,17 @@ static ssize_t modalias_show(struct devi + + return sprintf(buf, RPMSG_DEVICE_MODALIAS_FMT "\n", rpdev->id.name); + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute rpmsg_dev_attrs[] = { +- __ATTR_RO(name), +- __ATTR_RO(modalias), +- __ATTR_RO(dst), +- __ATTR_RO(src), +- __ATTR_RO(announce), +- __ATTR_NULL ++static struct attribute *rpmsg_dev_attrs[] = { ++ &dev_attr_name.attr, ++ &dev_attr_modalias.attr, ++ &dev_attr_dst.attr, ++ &dev_attr_src.attr, ++ &dev_attr_announce.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(rpmsg_dev); + + /* rpmsg devices and drivers are matched using the service name */ + static inline int rpmsg_id_match(const struct rpmsg_channel *rpdev, +@@ -427,7 +430,7 @@ static int rpmsg_dev_remove(struct devic + static struct bus_type rpmsg_bus = { + .name = "rpmsg", + .match = rpmsg_dev_match, +- .dev_attrs = rpmsg_dev_attrs, ++ .dev_groups = rpmsg_dev_groups, + .uevent = rpmsg_uevent, + .probe = rpmsg_dev_probe, + .remove = rpmsg_dev_remove, |