diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
| commit | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (patch) | |
| tree | 798f5b8bfb2a5b23e49fb68002f660b694c4e672 /p12.patch | |
| parent | ad2f0a874ca11c77885ea119cc80fe40c7e29eb3 (diff) | |
| download | patches-52894f7f35f3c6ad2b3362f021cdee69797d7a79.tar.gz | |
renames and a new patch
Diffstat (limited to 'p12.patch')
| -rw-r--r-- | p12.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/p12.patch b/p12.patch deleted file mode 100644 index c388af43bb36f5..00000000000000 --- a/p12.patch +++ /dev/null @@ -1,66 +0,0 @@ -From foo@baz Mon Oct 7 18:09:45 PDT 2013 -Date: Mon, 07 Oct 2013 18:09:45 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: input: gameport: 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 gameport bus code to use the -correct field. - -Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Cc: <linux-input@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/input/gameport/gameport.c | 17 ++++++++++------- - 1 file changed, 10 insertions(+), 7 deletions(-) - ---- a/drivers/input/gameport/gameport.c -+++ b/drivers/input/gameport/gameport.c -@@ -422,14 +422,15 @@ static struct gameport *gameport_get_pen - * Gameport port operations - */ - --static ssize_t gameport_show_description(struct device *dev, struct device_attribute *attr, char *buf) -+static ssize_t gameport_description_show(struct device *dev, struct device_attribute *attr, char *buf) - { - struct gameport *gameport = to_gameport_port(dev); - - return sprintf(buf, "%s\n", gameport->name); - } -+static DEVICE_ATTR(description, S_IRUGO, gameport_description_show, NULL); - --static ssize_t gameport_rebind_driver(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) -+static ssize_t drvctl_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) - { - struct gameport *gameport = to_gameport_port(dev); - struct device_driver *drv; -@@ -457,12 +458,14 @@ static ssize_t gameport_rebind_driver(st - - return error ? error : count; - } -+static DEVICE_ATTR_WO(drvctl); - --static struct device_attribute gameport_device_attrs[] = { -- __ATTR(description, S_IRUGO, gameport_show_description, NULL), -- __ATTR(drvctl, S_IWUSR, NULL, gameport_rebind_driver), -- __ATTR_NULL -+static struct attribute *gameport_device_attrs[] = { -+ &dev_attr_description.attr, -+ &dev_attr_drvctl.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(gameport_device); - - static void gameport_release_port(struct device *dev) - { -@@ -750,7 +753,7 @@ static int gameport_bus_match(struct dev - - static struct bus_type gameport_bus = { - .name = "gameport", -- .dev_attrs = gameport_device_attrs, -+ .dev_groups = gameport_device_groups, - .drv_groups = gameport_driver_groups, - .match = gameport_bus_match, - .probe = gameport_driver_probe, |