tty: serdev: use dev_groups and not dev_attrs for bus_type
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Jun 2017 13:48:11 +0000 (15:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jun 2017 09:00:46 +0000 (11:00 +0200)
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: Rob Herring <robh@kernel.org>
Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serdev/core.c

index 433de5ea9b02f53386b9367e64ad880ac6795e07..e454162d8c6e7025b76fb798d52af785efa8aded 100644 (file)
@@ -250,11 +250,13 @@ static ssize_t modalias_show(struct device *dev,
 {
        return of_device_modalias(dev, buf, PAGE_SIZE);
 }
+DEVICE_ATTR_RO(modalias);
 
-static struct device_attribute serdev_device_attrs[] = {
-       __ATTR_RO(modalias),
-       __ATTR_NULL
+static struct attribute *serdev_device_attrs[] = {
+       &dev_attr_modalias.attr,
+       NULL,
 };
+ATTRIBUTE_GROUPS(serdev_device);
 
 static struct bus_type serdev_bus_type = {
        .name           = "serial",
@@ -262,7 +264,7 @@ static struct bus_type serdev_bus_type = {
        .probe          = serdev_drv_probe,
        .remove         = serdev_drv_remove,
        .uevent         = serdev_uevent,
-       .dev_attrs      = serdev_device_attrs,
+       .dev_groups     = serdev_device_groups,
 };
 
 /**