diff options
Diffstat (limited to 'mei-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | mei-convert-bus-code-to-use-dev_groups.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/mei-convert-bus-code-to-use-dev_groups.patch b/mei-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..64daf8e7e28d43 --- /dev/null +++ b/mei-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,44 @@ +From foo@baz Fri Aug 23 14:15:28 PDT 2013 +Date: Fri, 23 Aug 2013 14:15:28 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: 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. + +Cc: Tomas Winkler <tomas.winkler@intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/misc/mei/bus.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/misc/mei/bus.c ++++ b/drivers/misc/mei/bus.c +@@ -108,11 +108,13 @@ static ssize_t modalias_show(struct devi + + return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute mei_cl_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_NULL, ++static struct attribute *mei_cl_dev_attrs[] = { ++ &dev_attr_modalias.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(mei_cl_dev); + + static int mei_cl_uevent(struct device *dev, struct kobj_uevent_env *env) + { +@@ -124,7 +126,7 @@ static int mei_cl_uevent(struct device * + + static struct bus_type mei_cl_bus_type = { + .name = "mei", +- .dev_attrs = mei_cl_dev_attrs, ++ .dev_groups = mei_cl_dev_groups, + .match = mei_cl_device_match, + .probe = mei_cl_device_probe, + .remove = mei_cl_device_remove, |