提交 32f389ec 编写于 作者: G Greg Kroah-Hartman

MEI: convert bus code to use dev_groups

The dev_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the MEI bus code to use
the correct field.
Acked-by: NTomas Winkler <tomas.winkler@intel.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 d13a280f
...@@ -108,11 +108,13 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a, ...@@ -108,11 +108,13 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
} }
static DEVICE_ATTR_RO(modalias);
static struct device_attribute mei_cl_dev_attrs[] = { static struct attribute *mei_cl_dev_attrs[] = {
__ATTR_RO(modalias), &dev_attr_modalias.attr,
__ATTR_NULL, NULL,
}; };
ATTRIBUTE_GROUPS(mei_cl_dev);
static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env) static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
...@@ -124,7 +126,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -124,7 +126,7 @@ static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env)
static struct bus_type mei_cl_bus_type = { static struct bus_type mei_cl_bus_type = {
.name = "mei", .name = "mei",
.dev_attrs = mei_cl_dev_attrs, .dev_groups = mei_cl_dev_groups,
.match = mei_cl_device_match, .match = mei_cl_device_match,
.probe = mei_cl_device_probe, .probe = mei_cl_device_probe,
.remove = mei_cl_device_remove, .remove = mei_cl_device_remove,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册