diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:09:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:09:52 -0700 |
| commit | 51347e968c062c4041dd5317122ab573f06b889b (patch) | |
| tree | 9a3e770e13b1ed3a33db897c78c8c3cd89b3b151 /hid-convert-bus-code-to-use-dev_groups.patch | |
| parent | bbcc0c699929d3b01ecf3066a35799defe733dd2 (diff) | |
| download | patches-51347e968c062c4041dd5317122ab573f06b889b.tar.gz | |
more patches upstream removed
Diffstat (limited to 'hid-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | hid-convert-bus-code-to-use-dev_groups.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/hid-convert-bus-code-to-use-dev_groups.patch b/hid-convert-bus-code-to-use-dev_groups.patch deleted file mode 100644 index 933bcbce5b4d69..00000000000000 --- a/hid-convert-bus-code-to-use-dev_groups.patch +++ /dev/null @@ -1,44 +0,0 @@ -From foo@baz Fri Aug 23 14:15:14 PDT 2013 -Date: Fri, 23 Aug 2013 14:15:14 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: HID: 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 HID bus code to use -the correct field. - -Cc: Jiri Kosina <jkosina@suse.cz> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/hid/hid-core.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - ---- a/drivers/hid/hid-core.c -+++ b/drivers/hid/hid-core.c -@@ -1917,11 +1917,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 hid_dev_attrs[] = { -- __ATTR_RO(modalias), -- __ATTR_NULL, -+static struct attribute *hid_dev_attrs[] = { -+ &dev_attr_modalias.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(hid_dev); - - static int hid_uevent(struct device *dev, struct kobj_uevent_env *env) - { -@@ -1949,7 +1951,7 @@ static int hid_uevent(struct device *dev - - static struct bus_type hid_bus_type = { - .name = "hid", -- .dev_attrs = hid_dev_attrs, -+ .dev_groups = hid_dev_groups, - .match = hid_bus_match, - .probe = hid_device_probe, - .remove = hid_device_remove, |