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 /input-serio-convert-bus-code-to-use-drv_groups.patch | |
| parent | bbcc0c699929d3b01ecf3066a35799defe733dd2 (diff) | |
| download | patches-51347e968c062c4041dd5317122ab573f06b889b.tar.gz | |
more patches upstream removed
Diffstat (limited to 'input-serio-convert-bus-code-to-use-drv_groups.patch')
| -rw-r--r-- | input-serio-convert-bus-code-to-use-drv_groups.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/input-serio-convert-bus-code-to-use-drv_groups.patch b/input-serio-convert-bus-code-to-use-drv_groups.patch deleted file mode 100644 index bfb6b8520602a3..00000000000000 --- a/input-serio-convert-bus-code-to-use-drv_groups.patch +++ /dev/null @@ -1,72 +0,0 @@ -From foo@baz Fri Aug 23 13:59:46 PDT 2013 -Date: Fri, 23 Aug 2013 13:59:46 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: Input: serio: convert bus code to use drv_groups - -The drv_attrs field of struct bus_type is going away soon, drv_groups -should be used instead. This converts the serio bus code to use the -correct field. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/input/serio/serio.c | 21 +++++++++++---------- - 1 file changed, 11 insertions(+), 10 deletions(-) - ---- a/drivers/input/serio/serio.c -+++ b/drivers/input/serio/serio.c -@@ -732,19 +732,20 @@ EXPORT_SYMBOL(serio_unregister_child_por - * Serio driver operations - */ - --static ssize_t serio_driver_show_description(struct device_driver *drv, char *buf) -+static ssize_t description_show(struct device_driver *drv, char *buf) - { - struct serio_driver *driver = to_serio_driver(drv); - return sprintf(buf, "%s\n", driver->description ? driver->description : "(none)"); - } -+static DRIVER_ATTR_RO(description); - --static ssize_t serio_driver_show_bind_mode(struct device_driver *drv, char *buf) -+static ssize_t bind_mode_show(struct device_driver *drv, char *buf) - { - struct serio_driver *serio_drv = to_serio_driver(drv); - return sprintf(buf, "%s\n", serio_drv->manual_bind ? "manual" : "auto"); - } - --static ssize_t serio_driver_set_bind_mode(struct device_driver *drv, const char *buf, size_t count) -+static ssize_t bind_mode_store(struct device_driver *drv, const char *buf, size_t count) - { - struct serio_driver *serio_drv = to_serio_driver(drv); - int retval; -@@ -760,14 +761,14 @@ static ssize_t serio_driver_set_bind_mod - - return retval; - } -+static DRIVER_ATTR_RW(bind_mode); - -- --static struct driver_attribute serio_driver_attrs[] = { -- __ATTR(description, S_IRUGO, serio_driver_show_description, NULL), -- __ATTR(bind_mode, S_IWUSR | S_IRUGO, -- serio_driver_show_bind_mode, serio_driver_set_bind_mode), -- __ATTR_NULL -+static struct attribute *serio_driver_attrs[] = { -+ &driver_attr_description.attr, -+ &driver_attr_bind_mode.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(serio_driver); - - static int serio_driver_probe(struct device *dev) - { -@@ -996,7 +997,7 @@ EXPORT_SYMBOL(serio_interrupt); - static struct bus_type serio_bus = { - .name = "serio", - .dev_attrs = serio_device_attrs, -- .drv_attrs = serio_driver_attrs, -+ .drv_groups = serio_driver_groups, - .match = serio_bus_match, - .uevent = serio_uevent, - .probe = serio_driver_probe, |