rpmsg: use dev_groups and not dev_attrs for bus_type

The dev_attrs field has long been "depreciated" and is finally being
removed, so move the driver to use the "correct" dev_groups field
instead for struct bus_type.

Cc: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: <linux-remoteproc@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
index 600f5f9f743100d459ec547ccaa1f6a96c632cd3..ad3d2a9df2871a8acf90bc86a3b33494b77ccf43 100644 (file)
--- 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 device *dev,
 
        return sprintf(buf, RPMSG_DEVICE_MODALIAS_FMT "\n", rpdev->id.name);
 }
-
-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 DEVICE_ATTR_RO(modalias);
+
+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 device *dev)
 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,