diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-06 15:48:11 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-09 11:00:46 +0200 |
commit | 4fe99816a1ab0323c39949bd0ee99a97b7e5875f (patch) | |
tree | cd6a1c49de5c0c8b6fe6b8bee05932637d33d56f /drivers/tty/serdev | |
parent | 33acc6db64f77a7bd773f4bc5cc8fcd1b6976ddc (diff) | |
download | linux-stable-4fe99816a1ab0323c39949bd0ee99a97b7e5875f.tar.gz linux-stable-4fe99816a1ab0323c39949bd0ee99a97b7e5875f.tar.bz2 linux-stable-4fe99816a1ab0323c39949bd0ee99a97b7e5875f.zip |
tty: serdev: 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: Rob Herring <robh@kernel.org>
Cc: Jiri Slaby <jslaby@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serdev')
-rw-r--r-- | drivers/tty/serdev/core.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/tty/serdev/core.c b/drivers/tty/serdev/core.c index 433de5ea9b02..e454162d8c6e 100644 --- a/drivers/tty/serdev/core.c +++ b/drivers/tty/serdev/core.c @@ -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, }; /** |