diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 15:24:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 15:24:25 -0700 |
| commit | aaf275f945460b5cb5ee6ea9ef95b06db5334461 (patch) | |
| tree | 8dd916f867832927b6cf9e91fbc14340ad8125a6 /x86-wmi-convert-class-code-to-use-dev_groups.patch | |
| parent | 1cfe8e5d3a8ac05c5a39afc11f57ac2c9fdabaa5 (diff) | |
| download | patches-aaf275f945460b5cb5ee6ea9ef95b06db5334461.tar.gz | |
break patch up into proper pieces
Diffstat (limited to 'x86-wmi-convert-class-code-to-use-dev_groups.patch')
| -rw-r--r-- | x86-wmi-convert-class-code-to-use-dev_groups.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/x86-wmi-convert-class-code-to-use-dev_groups.patch b/x86-wmi-convert-class-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..80c4e125d2ab69 --- /dev/null +++ b/x86-wmi-convert-class-code-to-use-dev_groups.patch @@ -0,0 +1,45 @@ +From foo@baz Tue Jul 9 15:15:36 PDT 2013 +Date: Tue, 09 Jul 2013 15:15:36 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: x86: wmi: convert class code to use dev_groups + +The dev_attrs field of struct class is going away soon, dev_groups +should be used instead. This converts the wmi class code to use the +correct field. + +Cc: Matthew Garrett <matthew.garrett@nebula.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/platform/x86/wmi.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/platform/x86/wmi.c ++++ b/drivers/platform/x86/wmi.c +@@ -693,11 +693,13 @@ static ssize_t modalias_show(struct devi + + return sprintf(buf, "wmi:%s\n", guid_string); + } ++static DEVICE_ATTR_RO(modalias); + +-static struct device_attribute wmi_dev_attrs[] = { +- __ATTR_RO(modalias), +- __ATTR_NULL ++static struct attribute *wmi_attrs[] = { ++ &dev_attr_modalias.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(wmi); + + static int wmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) + { +@@ -732,7 +734,7 @@ static struct class wmi_class = { + .name = "wmi", + .dev_release = wmi_dev_free, + .dev_uevent = wmi_dev_uevent, +- .dev_attrs = wmi_dev_attrs, ++ .dev_groups = wmi_groups, + }; + + static int wmi_create_device(const struct guid_block *gblock, |