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 /p23.patch | |
| parent | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (diff) | |
| download | patches-6e287ace225948565fdcbe3c5cc75d3843af79d0.tar.gz | |
cleaned up the bus_type.dev_attrs patch series
Diffstat (limited to 'p23.patch')
| -rw-r--r-- | p23.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/p23.patch b/p23.patch deleted file mode 100644 index ca65e73be073f7..00000000000000 --- a/p23.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- - drivers/rpmsg/rpmsg_core.c | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - ---- a/drivers/rpmsg/rpmsg_core.c -+++ b/drivers/rpmsg/rpmsg_core.c -@@ -330,7 +330,8 @@ field##_show(struct device *dev, \ - struct rpmsg_device *rpdev = to_rpmsg_device(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"); -@@ -345,15 +346,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_device *rpdev, -@@ -455,7 +458,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, |