浏览代码

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>
Greg Kroah-Hartman 8 年之前
父节点
当前提交
4fe99816a1
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      drivers/tty/serdev/core.c

+ 6 - 4
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);
 	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 = {
 static struct bus_type serdev_bus_type = {
 	.name		= "serial",
 	.name		= "serial",
@@ -262,7 +264,7 @@ static struct bus_type serdev_bus_type = {
 	.probe		= serdev_drv_probe,
 	.probe		= serdev_drv_probe,
 	.remove		= serdev_drv_remove,
 	.remove		= serdev_drv_remove,
 	.uevent		= serdev_uevent,
 	.uevent		= serdev_uevent,
-	.dev_attrs	= serdev_device_attrs,
+	.dev_groups	= serdev_device_groups,
 };
 };
 
 
 /**
 /**